Skip to content

Commit fd9af91

Browse files
committed
Fix CI errors by adding CIRCUITPY_BOOT_BUTTON_NO_GPIO for boards w/o BOOTSEL GPIO connection.
1 parent 3c6056f commit fd9af91

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

ports/raspberrypi/supervisor/port.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
#include "RP2350.h" // CMSIS
5757
#endif
5858

59-
#ifdef CIRCUITPY_BOOT_BUTTON
59+
#ifdef CIRCUITPY_BOOT_BUTTON_NO_GPIO
6060
#include "hardware/gpio.h"
6161
#include "hardware/sync.h"
6262
#include "hardware/structs/ioqspi.h"
@@ -584,7 +584,7 @@ void port_boot_info(void) {
584584
#endif
585585
}
586586

587-
#if defined(CIRCUITPY_BOOT_BUTTON)
587+
#if defined(CIRCUITPY_BOOT_BUTTON_NO_GPIO)
588588
bool __no_inline_not_in_flash_func(port_boot_button_pressed)(void) {
589589
// Sense the state of the boot button. Because this function
590590
// disables flash, it cannot be safely called once the second

supervisor/shared/port.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ MP_WEAK size_t port_heap_get_largest_free_size(void) {
6767
}
6868

6969
MP_WEAK bool port_boot_button_pressed(void) {
70-
#if defined(CIRCUITPY_BOOT_BUTTON) && CIRCUITPY_BOOT_BUTTON != 1
70+
#if defined(CIRCUITPY_BOOT_BUTTON)
7171
// Init/deinit the boot button every time in case it is used for LEDs.
7272
digitalio_digitalinout_obj_t boot_button;
7373
common_hal_digitalio_digitalinout_construct(&boot_button, CIRCUITPY_BOOT_BUTTON);

supervisor/shared/safe_mode.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ void print_safe_mode_message(safe_mode_t reason) {
129129
case SAFE_MODE_USER:
130130
#if defined(BOARD_USER_SAFE_MODE_ACTION)
131131
message = BOARD_USER_SAFE_MODE_ACTION;
132-
#elif defined(CIRCUITPY_BOOT_BUTTON)
132+
#elif defined(CIRCUITPY_BOOT_BUTTON) || defined(CIRCUITPY_BOOT_BUTTON_NO_GPIO)
133133
message = MP_ERROR_TEXT("You pressed the BOOT button at start up");
134134
#else
135135
message = MP_ERROR_TEXT("You pressed the reset button during boot.");

0 commit comments

Comments
 (0)