Skip to content

Commit 62e76d1

Browse files
committed
Sync the overlay: SPIRAM_OCT_DEBUG
Picks up micropython-pydevices@b31da81, which renames the esp32s3 debug variant from SPIRAM_OCT_JTAG to SPIRAM_OCT_DEBUG so build_mp.sh --debug can find it. --debug now resolves: debug: selecting BOARD_VARIANT=SPIRAM_OCT_DEBUG (UART REPL + USB Serial/JTAG console) and the renamed patch applies cleanly to a pristine tree.
1 parent 5dcd5e3 commit 62e76d1

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

MICROPYTHON_PYDEVICES_COMMIT

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
7038f8b7f120b13549fed3d4e7f6cd7781baa76e
1+
b31da81bfdaaa214c76f858abfb3abcd804f62db

patches/0009-micropython-esp32s3-add-SPIRAM_OCT_JTAG-debug-variant.patch renamed to patches/0009-micropython-esp32s3-add-SPIRAM_OCT_DEBUG-variant.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ index b383dfa06..e762e6449 100644
88
"variants": {
99
- "SPIRAM_OCT": "Support for Octal-SPIRAM"
1010
+ "SPIRAM_OCT": "Support for Octal-SPIRAM",
11-
+ "SPIRAM_OCT_JTAG": "Octal-SPIRAM debug build: USB device stack off (Serial-JTAG owns the PHY: on-chip debug + JTAG-CDC REPL), flash coredump enabled"
11+
+ "SPIRAM_OCT_DEBUG": "Octal-SPIRAM debug build: USB device stack off (Serial-JTAG owns the PHY: on-chip debug + JTAG-CDC REPL), flash coredump enabled"
1212
},
1313
"old_variants": {
1414
- "FLASH_4M": ["4MiB flash", "Use the standard variant instead."]
@@ -18,11 +18,11 @@ index b383dfa06..e762e6449 100644
1818
+ ]
1919
}
2020
}
21-
diff --git a/ports/esp32/boards/ESP32_GENERIC_S3/mpconfigvariant_SPIRAM_OCT_JTAG.cmake b/ports/esp32/boards/ESP32_GENERIC_S3/mpconfigvariant_SPIRAM_OCT_JTAG.cmake
21+
diff --git a/ports/esp32/boards/ESP32_GENERIC_S3/mpconfigvariant_SPIRAM_OCT_DEBUG.cmake b/ports/esp32/boards/ESP32_GENERIC_S3/mpconfigvariant_SPIRAM_OCT_DEBUG.cmake
2222
new file mode 100644
2323
index 000000000..df2664f0f
2424
--- /dev/null
25-
+++ b/ports/esp32/boards/ESP32_GENERIC_S3/mpconfigvariant_SPIRAM_OCT_JTAG.cmake
25+
+++ b/ports/esp32/boards/ESP32_GENERIC_S3/mpconfigvariant_SPIRAM_OCT_DEBUG.cmake
2626
@@ -0,0 +1,17 @@
2727
+# SPIRAM_OCT debug variant: the USB device stack is disabled so the S3's
2828
+# single USB PHY stays with USB-Serial-JTAG - on-chip debugging (OpenOCD/gdb)

0 commit comments

Comments
 (0)