Update CIRCUITPY_BOOT_BUTTON_NO_GPIO to 0/1 for false/true. Add compile time check forbidding CIRCUITPY_BOOT_BUTTON and CIRCUITPY_BOOT_BUTTON_NO_GPIO.

Author: eightycc

ports/raspberrypi/supervisor/port.c

@@ -56,7 +56,7 @@
 #include "RP2350.h" // CMSIS
 #endif
 
-#ifdef CIRCUITPY_BOOT_BUTTON_NO_GPIO
+#if CIRCUITPY_BOOT_BUTTON_NO_GPIO
 #include "hardware/gpio.h"
 #include "hardware/sync.h"
 #include "hardware/structs/ioqspi.h"
@@ -584,7 +584,7 @@ void port_boot_info(void) {
     #endif
 }
 
-#if defined(CIRCUITPY_BOOT_BUTTON_NO_GPIO)
+#if CIRCUITPY_BOOT_BUTTON_NO_GPIO
 bool __no_inline_not_in_flash_func(port_boot_button_pressed)(void) {
     // Sense the state of the boot button. Because this function
     // disables flash, it cannot be safely called once the second

py/circuitpy_mpconfig.h

@@ -635,6 +635,15 @@ void background_callback_run_all(void);
 #define CIRCUITPY_SAVES_PARTITION_SIZE 0
 #endif
 
+// Boards that have a boot button connected to a GPIO pin should set
+// CIRCUITPY_BOOT_BUTTON_NO_GPIO to 1.
+#ifndef CIRCUITPY_BOOT_BUTTON_NO_GPIO
+#define CIRCUITPY_BOOT_BUTTON_NO_GPIO (0)
+#endif
+#if defined(CIRCUITPY_BOOT_BUTTON) && CIRCUITPY_BOOT_BUTTON_NO_GPIO
+#error "CIRCUITPY_BOOT_BUTTON and CIRCUITPY_BOOT_BUTTON_NO_GPIO are mutually exclusive"
+#endif
+
 #if defined(__GNUC__) && !defined(__ZEPHYR__)
 #if __GNUC__ < CIRCUITPY_MIN_GCC_VERSION
 // (the 3 level scheme here is required to get expansion & stringization

supervisor/shared/safe_mode.c

@@ -129,7 +129,7 @@ void print_safe_mode_message(safe_mode_t reason) {
         case SAFE_MODE_USER:
             #if defined(BOARD_USER_SAFE_MODE_ACTION)
             message = BOARD_USER_SAFE_MODE_ACTION;
-            #elif defined(CIRCUITPY_BOOT_BUTTON) || defined(CIRCUITPY_BOOT_BUTTON_NO_GPIO)
+            #elif defined(CIRCUITPY_BOOT_BUTTON) || CIRCUITPY_BOOT_BUTTON_NO_GPIO
             message = MP_ERROR_TEXT("You pressed the BOOT button at start up");
             #else
             message = MP_ERROR_TEXT("You pressed the reset button during boot.");