Merge branch 'master' into ota2350

Author: earlephilhower

cores/rp2040/malloc-lock.cpp

@@ -88,7 +88,7 @@ extern "C" void *__wrap_realloc(void *mem, size_t size) {
     void *rc;
     noInterrupts();
 #ifdef RP2350_PSRAM_CS
-    if (mem < __ram_start) {
+    if (mem && (mem < __ram_start)) {
         rc = __psram_realloc(mem, size);
     } else {
         rc = __real_realloc(mem, size);
@@ -103,7 +103,7 @@ extern "C" void *__wrap_realloc(void *mem, size_t size) {
 extern "C" void __wrap_free(void *mem) {
     noInterrupts();
 #ifdef RP2350_PSRAM_CS
-    if (mem < __ram_start) {
+    if (mem && (mem < __ram_start)) {
         __psram_free(mem);
     } else {
         __real_free(mem);

tools/platformio-build.py

@@ -127,7 +127,6 @@ def is_pio_build():
             "ARDUINO_ARCH_RP2040",
             ("F_CPU", "$BOARD_F_CPU"),
             ("BOARD_NAME", '\\"%s\\"' % env.subst("$BOARD")),
-            ("CFG_TUSB_DEBUG", "0"),
             ("CFG_TUSB_MCU", "OPT_MCU_RP2040"),
             ("CFG_TUSB_OS", "OPT_OS_PICO"),
             ("LIB_BOOT_STAGE2_HEADERS", "1"),