Skip to content

Commit 4f166f2

Browse files
committed
add CONFIG_IDF_TARGET_ESP32C6 conditionals
1 parent 121d9ee commit 4f166f2

File tree

3 files changed

+9
-4
lines changed

3 files changed

+9
-4
lines changed

ports/espressif/common-hal/microcontroller/__init__.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ void common_hal_mcu_enable_interrupts(void) {
8181
void common_hal_mcu_on_next_reset(mcu_runmode_t runmode) {
8282
switch (runmode) {
8383
case RUNMODE_UF2:
84-
#if defined(CONFIG_IDF_TARGET_ESP32) || defined(CONFIG_IDF_TARGET_ESP32C3)
84+
#if defined(CONFIG_IDF_TARGET_ESP32) || defined(CONFIG_IDF_TARGET_ESP32C3) || defined(CONFIG_IDF_TARGET_ESP32C6)
8585
mp_arg_error_invalid(MP_QSTR_run_mode);
8686
#else
8787
// 0x11F2 is APP_REQUEST_UF2_RESET_HINT & is defined by TinyUF2

ports/espressif/supervisor/port.c

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -240,9 +240,12 @@ safe_mode_t port_init(void) {
240240

241241
#if DEBUG
242242
// debug UART
243-
#ifdef CONFIG_IDF_TARGET_ESP32C3
243+
#if defined(CONFIG_IDF_TARGET_ESP32C3)
244244
common_hal_never_reset_pin(&pin_GPIO20);
245245
common_hal_never_reset_pin(&pin_GPIO21);
246+
#elif defined(CONFIG_IDF_TARGET_ESP32C6)
247+
common_hal_never_reset_pin(&pin_GPIO16);
248+
common_hal_never_reset_pin(&pin_GPIO17);
246249
#elif defined(CONFIG_IDF_TARGET_ESP32S2) || defined(CONFIG_IDF_TARGET_ESP32S3)
247250
common_hal_never_reset_pin(&pin_GPIO43);
248251
common_hal_never_reset_pin(&pin_GPIO44);
@@ -256,7 +259,7 @@ safe_mode_t port_init(void) {
256259
#if ENABLE_JTAG
257260
ESP_LOGI(TAG, "Marking JTAG pins never_reset");
258261
// JTAG
259-
#ifdef CONFIG_IDF_TARGET_ESP32C3
262+
#if defined(CONFIG_IDF_TARGET_ESP32C3) || defined(CONFIG_IDF_TARGET_ESP32C6)
260263
common_hal_never_reset_pin(&pin_GPIO4);
261264
common_hal_never_reset_pin(&pin_GPIO5);
262265
common_hal_never_reset_pin(&pin_GPIO6);

ports/espressif/supervisor/usb.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,10 @@
2020
#include "driver/gpio.h"
2121
#include "esp_private/periph_ctrl.h"
2222

23-
#ifdef CONFIG_IDF_TARGET_ESP32C3
23+
#if defined(CONFIG_IDF_TARGET_ESP32C3)
2424
#include "components/esp_rom/include/esp32c3/rom/gpio.h"
25+
#elif defined(CONFIG_IDF_TARGET_ESP32C6)
26+
#include "components/esp_rom/include/esp32c6/rom/gpio.h"
2527
#elif defined(CONFIG_IDF_TARGET_ESP32S2)
2628
#include "components/esp_rom/include/esp32s2/rom/gpio.h"
2729
#elif defined(CONFIG_IDF_TARGET_ESP32S3)

0 commit comments

Comments
 (0)