Skip to content

Commit a09dfcd

Browse files
tmedicciacassis
authored andcommitted
boards/Kconfig: Fix bug on ESP32, ESP32-S2 and ESP32-S3 GPIO IRQ
A previous commit (d2c85a9) introduced an incomplete change to upstream regarding GPIO IRQ selection on ESP32, ESP32-S2 and ESP32-S3. NuttX's upstream CI did not get the error because of the rules that trigger specific pipelines based on the modified files. In this case, the xtensa jobs did not run to properly evaluate this issue. Signed-off-by: Tiago Medicci Serrano <tiago.medicci@espressif.com>
1 parent f4a6e62 commit a09dfcd

File tree

1 file changed

+23
-23
lines changed

1 file changed

+23
-23
lines changed

boards/Kconfig

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ config ARCH_BOARD_ESP32_AUDIO_KIT
251251
depends on ARCH_CHIP_ESP32_A1S
252252
select ARCH_HAVE_LEDS
253253
select ARCH_HAVE_BUTTONS
254-
select ARCH_HAVE_IRQBUTTONS if ESPRESSIF_GPIO_IRQ
254+
select ARCH_HAVE_IRQBUTTONS if ESP32_GPIO_IRQ
255255
---help---
256256
The Ai-Thinker ESP32-Audio-Kit is a board with the ESP32-A1S module
257257
powered by ESP32-D0WD-V3 with 16MB of SPI Flash and 8MB PSRAM, and an
@@ -263,7 +263,7 @@ config ARCH_BOARD_ESP32_DEVKITC
263263
depends on ARCH_CHIP_ESP32WROOM32 || ARCH_CHIP_ESP32WROOM32_8MB || ARCH_CHIP_ESP32WROOM32_16MB || ARCH_CHIP_ESP32WROVER || ARCH_CHIP_ESP32SOLO1
264264
select ARCH_HAVE_LEDS
265265
select ARCH_HAVE_BUTTONS
266-
select ARCH_HAVE_IRQBUTTONS if ESPRESSIF_GPIO_IRQ
266+
select ARCH_HAVE_IRQBUTTONS if ESP32_GPIO_IRQ
267267
---help---
268268
The ESP32 is a dual-core system from Espressif with two Harvard
269269
architecture Xtensa LX6 CPUs. All embedded memory, external memory
@@ -291,7 +291,7 @@ config ARCH_BOARD_ESP32_ETHERNETKIT
291291
bool "Espressif ESP32 Ethernet Kit"
292292
depends on ARCH_CHIP_ESP32WROVER
293293
select ARCH_HAVE_BUTTONS
294-
select ARCH_HAVE_IRQBUTTONS if ESPRESSIF_GPIO_IRQ
294+
select ARCH_HAVE_IRQBUTTONS if ESP32_GPIO_IRQ
295295
---help---
296296
The ESP32-Ethernet-Kit is an Ethernet-to-Wi-Fi development board that enables
297297
Ethernet devices to be interconnected over Wi-Fi. At the same time, to provide
@@ -303,7 +303,7 @@ config ARCH_BOARD_ESP32_LYRAT
303303
depends on ARCH_CHIP_ESP32WROVER
304304
select ARCH_HAVE_LEDS
305305
select ARCH_HAVE_BUTTONS
306-
select ARCH_HAVE_IRQBUTTONS if ESPRESSIF_GPIO_IRQ
306+
select ARCH_HAVE_IRQBUTTONS if ESP32_GPIO_IRQ
307307
---help---
308308
ESP32-LyraT is an open-source development board for Espressif Systems' Audio
309309
Development Framework (ADF). It is designed for smart speakers and smart-home
@@ -313,7 +313,7 @@ config ARCH_BOARD_ESP32_PICO_KIT
313313
bool "Espressif ESP32-PICO-KIT V4"
314314
depends on ARCH_CHIP_ESP32PICOD4
315315
select ARCH_HAVE_BUTTONS
316-
select ARCH_HAVE_IRQBUTTONS if ESPRESSIF_GPIO_IRQ
316+
select ARCH_HAVE_IRQBUTTONS if ESP32_GPIO_IRQ
317317
---help---
318318
ESP32-PICO-KIT is an ESP32-based mini development board produced by Espressif.
319319
The core of this board is ESP32-PICO-D4, a System-in-Package module with complete
@@ -328,7 +328,7 @@ config ARCH_BOARD_ESP32_SPARROWKIT
328328
depends on ARCH_CHIP_ESP32WROVER
329329
select ARCH_HAVE_LEDS
330330
select ARCH_HAVE_BUTTONS
331-
select ARCH_HAVE_IRQBUTTONS if ESPRESSIF_GPIO_IRQ
331+
select ARCH_HAVE_IRQBUTTONS if ESP32_GPIO_IRQ
332332
---help---
333333
ESP32-SPARROW-KIT is a custom-made board based on Espressif's ESP32WROVER chip
334334
and built upon the ESP32-WROVERKIT board. It is designed for a university
@@ -345,7 +345,7 @@ config ARCH_BOARD_ESP32_WROVERKIT
345345
depends on ARCH_CHIP_ESP32WROVER
346346
select ARCH_HAVE_LEDS
347347
select ARCH_HAVE_BUTTONS
348-
select ARCH_HAVE_IRQBUTTONS if ESPRESSIF_GPIO_IRQ
348+
select ARCH_HAVE_IRQBUTTONS if ESP32_GPIO_IRQ
349349
---help---
350350
ESP-WROVER-KIT is an ESP32-based development board produced by Espressif.
351351
ESP-WROVER-KIT features the following integrated components:
@@ -364,7 +364,7 @@ config ARCH_BOARD_LILYGO_TBEAM_LORA_GPS
364364
depends on ARCH_CHIP_ESP32WROOM32
365365
select ARCH_HAVE_LEDS
366366
select ARCH_HAVE_BUTTONS
367-
select ARCH_HAVE_IRQBUTTONS if ESPRESSIF_GPIO_IRQ
367+
select ARCH_HAVE_IRQBUTTONS if ESP32_GPIO_IRQ
368368
---help---
369369
LilyGO_TBeam_V1.1 LoRa/GPS is an ESP32 board with LoRa and GPS.
370370
More info: https://github.com/Xinyuan-LilyGO/LilyGo-LoRa-Series/
@@ -374,7 +374,7 @@ config ARCH_BOARD_TTGO_LORA_ESP32
374374
depends on ARCH_CHIP_ESP32WROOM32
375375
select ARCH_HAVE_LEDS
376376
select ARCH_HAVE_BUTTONS
377-
select ARCH_HAVE_IRQBUTTONS if ESPRESSIF_GPIO_IRQ
377+
select ARCH_HAVE_IRQBUTTONS if ESP32_GPIO_IRQ
378378
---help---
379379
TTGO-LoRa-SX1276-ESP32 is an ESP32 board with LoRa. Usually it
380380
comes with an OLED display, but there are options without
@@ -402,7 +402,7 @@ config ARCH_BOARD_TTGO_T_DISPLAY_ESP32
402402
depends on ARCH_CHIP_ESP32WROOM32 || ARCH_CHIP_ESP32WROOM32_8MB || ARCH_CHIP_ESP32WROOM32_16MB || ARCH_CHIP_ESP32WROVER || ARCH_CHIP_ESP32SOLO1
403403
select ARCH_HAVE_LEDS
404404
select ARCH_HAVE_BUTTONS
405-
select ARCH_HAVE_IRQBUTTONS if ESPRESSIF_GPIO_IRQ
405+
select ARCH_HAVE_IRQBUTTONS if ESP32_GPIO_IRQ
406406
---help---
407407
TTGO-T-DISPLAY-ESP32 is an ESP32 with a TFT Display.
408408
This port is for board version 1.1, more info:
@@ -461,7 +461,7 @@ config ARCH_BOARD_ESP32S2_KALUGA_1
461461
depends on ARCH_CHIP_ESP32S2WROVER
462462
select ARCH_HAVE_LEDS
463463
select ARCH_HAVE_BUTTONS
464-
select ARCH_HAVE_IRQBUTTONS if ESPRESSIF_GPIO_IRQ
464+
select ARCH_HAVE_IRQBUTTONS if ESP32S2_GPIO_IRQ
465465
---help---
466466
This is the ESP32-S2-Kaluga-1 board
467467

@@ -470,7 +470,7 @@ config ARCH_BOARD_ESP32S2_SAOLA_1
470470
depends on ARCH_CHIP_ESP32S2WROVER
471471
select ARCH_HAVE_LEDS
472472
select ARCH_HAVE_BUTTONS
473-
select ARCH_HAVE_IRQBUTTONS if ESPRESSIF_GPIO_IRQ
473+
select ARCH_HAVE_IRQBUTTONS if ESP32S2_GPIO_IRQ
474474
---help---
475475
This is the ESP32-S2-Saola-1 board
476476

@@ -479,7 +479,7 @@ config ARCH_BOARD_FRANZININHO_WIFI
479479
depends on ARCH_CHIP_ESP32S2WROVER
480480
select ARCH_HAVE_LEDS
481481
select ARCH_HAVE_BUTTONS
482-
select ARCH_HAVE_IRQBUTTONS if ESPRESSIF_GPIO_IRQ
482+
select ARCH_HAVE_IRQBUTTONS if ESP32S2_GPIO_IRQ
483483
---help---
484484
Franzininho Wi-Fi is a development board to evaluate the ESP32-S2 SoC
485485

@@ -488,7 +488,7 @@ config ARCH_BOARD_ESP32S3_DEVKIT
488488
depends on ARCH_CHIP_ESP32S3WROOM1N4 || ARCH_CHIP_ESP32S3MINI1N8 || ARCH_CHIP_ESP32S3WROOM1N8R2 || ARCH_CHIP_ESP32S3WROOM1N16R8 || ARCH_CHIP_ESP32S3WROOM2N16R8V || ARCH_CHIP_ESP32S3WROOM2N32R8V || ARCH_CHIP_ESP32S3CUSTOM || ARCH_CHIP_ESP32S3WROOM1N8R8
489489
select ARCH_HAVE_LEDS
490490
select ARCH_HAVE_BUTTONS
491-
select ARCH_HAVE_IRQBUTTONS if ESPRESSIF_GPIO_IRQ
491+
select ARCH_HAVE_IRQBUTTONS if ESP32S3_GPIO_IRQ
492492
---help---
493493
The ESP32-S3 DevKit features the ESP32-S3 CPU with dual Xtensa LX7 cores.
494494
It comes in two flavors, the ESP32-S3-DevKitM-1 and the ESP32-S3-DevKitC-1.
@@ -500,7 +500,7 @@ config ARCH_BOARD_ESP32S3_8048S043
500500
bool "ESP32-S3 8048S043"
501501
depends on ARCH_CHIP_ESP32S3WROOM1N4 || ARCH_CHIP_ESP32S3MINI1N8 || ARCH_CHIP_ESP32S3WROOM1N8R2 || ARCH_CHIP_ESP32S3WROOM1N16R8 || ARCH_CHIP_ESP32S3WROOM2N16R8V || ARCH_CHIP_ESP32S3WROOM2N32R8V || ARCH_CHIP_ESP32S3CUSTOM || ARCH_CHIP_ESP32S3WROOM1N8R8
502502
select ARCH_HAVE_BUTTONS
503-
select ARCH_HAVE_IRQBUTTONS if ESPRESSIF_GPIO_IRQ
503+
select ARCH_HAVE_IRQBUTTONS if ESP32S3_GPIO_IRQ
504504
---help---
505505
The ESP32-S3 8048S043 features the ESP32-S3 CPU with dual Xtensa LX7 cores.
506506

@@ -509,7 +509,7 @@ config ARCH_BOARD_ESP32S3_EYE
509509
depends on ARCH_CHIP_ESP32S3WROOM1N4 || ARCH_CHIP_ESP32S3CUSTOM
510510
select ARCH_HAVE_LEDS
511511
select ARCH_HAVE_BUTTONS
512-
select ARCH_HAVE_IRQBUTTONS if ESPRESSIF_GPIO_IRQ
512+
select ARCH_HAVE_IRQBUTTONS if ESP32S3_GPIO_IRQ
513513
---help---
514514
The ESP32-S3-EYE is a small-sized AI development board produced by Espressif
515515
featuring the ESP32-S3 CPU with a 2-Megapixel camera, an LCD display,
@@ -520,7 +520,7 @@ config ARCH_BOARD_ESP32S3_LCD_EV
520520
depends on ARCH_CHIP_ESP32S3WROOM2N16R8V || ARCH_CHIP_ESP32S3WROOM2N32R8V || ARCH_CHIP_ESP32S3WROOM1N16R16V || ARCH_CHIP_ESP32S3CUSTOM
521521
select ARCH_HAVE_LEDS
522522
select ARCH_HAVE_BUTTONS
523-
select ARCH_HAVE_IRQBUTTONS if ESPRESSIF_GPIO_IRQ
523+
select ARCH_HAVE_IRQBUTTONS if ESP32S3_GPIO_IRQ
524524
---help---
525525
ESP32-S3-LCD-EV is an ESP32-S3-based development board with a touchscreen.
526526
Together with different subboards, ESP32-S3-LCD-EV-Board can drive LCDs with IIC,
@@ -537,7 +537,7 @@ config ARCH_BOARD_ESP32S3_LHCBIT
537537
bool "ESP32-S3 LHCBit"
538538
depends on ARCH_CHIP_ESP32S3WROOM1N16R8
539539
select ARCH_HAVE_BUTTONS
540-
select ARCH_HAVE_IRQBUTTONS if ESPRESSIF_GPIO_IRQ
540+
select ARCH_HAVE_IRQBUTTONS if ESP32S3_GPIO_IRQ
541541
---help---
542542
The ESP32-S3 LHCBit features the ESP32-S3 CPU with dual Xtensa LX7 cores.
543543

@@ -546,7 +546,7 @@ config ARCH_BOARD_ESP32S3_XIAO
546546
depends on ARCH_CHIP_ESP32S3WROOM1N16R8 || ARCH_CHIP_ESP32S3WROOM1N8R8
547547
select ARCH_HAVE_LEDS
548548
select ARCH_HAVE_BUTTONS
549-
select ARCH_HAVE_IRQBUTTONS if ESPRESSIF_GPIO_IRQ
549+
select ARCH_HAVE_IRQBUTTONS if ESP32S3_GPIO_IRQ
550550
---help---
551551
The XIAO-ESP32S3 from Seeed Studio features the ESP32-S3 CPU with dual Xtensa LX7 cores,
552552
with 8MiB Octal SPI PSRAM and 8MiB or 16MiB flash.
@@ -556,7 +556,7 @@ config ARCH_BOARD_ESP32S3_BOX
556556
depends on ARCH_CHIP_ESP32S3WROOM2N16R8V || ARCH_CHIP_ESP32S3WROOM2N32R8V || ARCH_CHIP_ESP32S3CUSTOM
557557
select ARCH_HAVE_LEDS
558558
select ARCH_HAVE_BUTTONS
559-
select ARCH_HAVE_IRQBUTTONS if ESPRESSIF_GPIO_IRQ
559+
select ARCH_HAVE_IRQBUTTONS if ESP32S3_GPIO_IRQ
560560
---help---
561561
The ESP-BOX is an advanced AIoT, Edge AI, and IIoT applications development platform
562562
released by Espressif Systems. The board is built on Espressif’s powerful ESP32-S3
@@ -570,7 +570,7 @@ config ARCH_BOARD_ESP32S3_KORVO_2
570570
depends on ARCH_CHIP_ESP32S3WROOM1N16R8 || ARCH_CHIP_ESP32S3WROOM1N8R8
571571
select ARCH_HAVE_LEDS
572572
select ARCH_HAVE_BUTTONS
573-
select ARCH_HAVE_IRQBUTTONS if ESPRESSIF_GPIO_IRQ
573+
select ARCH_HAVE_IRQBUTTONS if ESP32S3_GPIO_IRQ
574574
---help---
575575
The ESP32-S3-Korvo-2 is a multimedia development board based on the ESP32-S3 chip.
576576
It is equipped with a two-microphone array which is suitable for voice recognition
@@ -585,7 +585,7 @@ config ARCH_BOARD_ESP32S3_MEADOW
585585
depends on ARCH_CHIP_ESP32S3WROOM1N4 || ARCH_CHIP_ESP32S3CUSTOM
586586
select ARCH_HAVE_LEDS
587587
select ARCH_HAVE_BUTTONS
588-
select ARCH_HAVE_IRQBUTTONS if ESPRESSIF_GPIO_IRQ
588+
select ARCH_HAVE_IRQBUTTONS if ESP32S3_GPIO_IRQ
589589
---help---
590590
The ESP32-S3-Meadow is a small-sized board produced by WildernessLabs
591591
featuring the ESP32-S3 CPU with 32MiB Octal SPI PSRAM and 64 MiB flash.
@@ -595,7 +595,7 @@ config ARCH_BOARD_ESP32S3_LCKFB_SZPI
595595
depends on ARCH_CHIP_ESP32S3WROOM1N16R8
596596
select ARCH_HAVE_LEDS
597597
select ARCH_HAVE_BUTTONS
598-
select ARCH_HAVE_IRQBUTTONS if ESPRESSIF_GPIO_IRQ
598+
select ARCH_HAVE_IRQBUTTONS if ESP32S3_GPIO_IRQ
599599

600600
config ARCH_BOARD_ESP32C6_DEVKITC
601601
bool "Espressif ESP32-C6-DevKitC-1"

0 commit comments

Comments
 (0)