This is an automated email from the ASF dual-hosted git repository. xiaoxiang pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit 26999450ccc5ed117468a6f69ed179aca7b8af48 Author: Eren Terzioglu <[email protected]> AuthorDate: Mon Mar 18 14:30:21 2024 +0300 boards/esp32c6: Rename esp32c6-devkit as esp32c6-devkitc --- boards/Kconfig | 14 +++++++------- .../esp32c6/{esp32c6-devkit => esp32c6-devkitc}/Kconfig | 4 ++-- .../configs/buttons/defconfig | 5 +++-- .../configs/gpio/defconfig | 5 +++-- .../configs/nsh/defconfig | 5 +++-- .../configs/ostest/defconfig | 5 +++-- .../configs/pwm/defconfig | 5 +++-- .../configs/random/defconfig | 5 +++-- .../configs/rmt/defconfig | 5 +++-- .../configs/rtc/defconfig | 5 +++-- .../configs/spiflash/defconfig | 5 +++-- .../configs/tickless/defconfig | 5 +++-- .../configs/timers/defconfig | 5 +++-- .../configs/usbconsole/defconfig | 5 +++-- .../configs/watchdog/defconfig | 5 +++-- .../{esp32c6-devkit => esp32c6-devkitc}/include/board.h | 8 ++++---- .../{esp32c6-devkit => esp32c6-devkitc}/scripts/Make.defs | 2 +- .../{esp32c6-devkit => esp32c6-devkitc}/src/Make.defs | 2 +- .../src/esp32c6-devkitc.h} | 8 ++++---- .../src/esp32c6_appinit.c | 4 ++-- .../{esp32c6-devkit => esp32c6-devkitc}/src/esp32c6_boot.c | 2 +- .../src/esp32c6_bringup.c | 4 ++-- .../src/esp32c6_buttons.c | 4 ++-- .../{esp32c6-devkit => esp32c6-devkitc}/src/esp32c6_gpio.c | 4 ++-- .../src/esp32c6_reset.c | 2 +- 25 files changed, 68 insertions(+), 55 deletions(-) diff --git a/boards/Kconfig b/boards/Kconfig index ddf0e8007b..2470998350 100644 --- a/boards/Kconfig +++ b/boards/Kconfig @@ -487,13 +487,13 @@ config ARCH_BOARD_ESP32S3_MEADOW The ESP32-S3-Meadow is a small-sized board produced by WildernessLabs featuring the ESP32-S3 CPU with 32MiB Octal SPI PSRAM and 64 MiB flash. -config ARCH_BOARD_ESP32C6_DEVKIT - bool "Espressif ESP32-C6 Generic DevKit" - depends on ESPRESSIF_ESP32C6 +config ARCH_BOARD_ESP32C6_DEVKITC + bool "Espressif ESP32-C6-DevKitC-1" + depends on ARCH_CHIP_ESP32C6WROOM1 select ARCH_HAVE_BUTTONS select ARCH_HAVE_IRQBUTTONS ---help--- - The ESP32-C6 DevKit features the ESP32-C6 CPU with a RISC-V core. + The ESP32-C6 DevKitC-1 features the ESP32-C6 CPU with a RISC-V core. config ARCH_BOARD_ESP32C6_DEVKITM bool "Espressif ESP32-C6 DevKitM-1" @@ -3172,7 +3172,7 @@ config ARCH_BOARD default "esp32s3-meadow" if ARCH_BOARD_ESP32S3_MEADOW default "esp32s3-lcd-ev" if ARCH_BOARD_ESP32S3_LCD_EV default "esp32s3-box" if ARCH_BOARD_ESP32S3_BOX - default "esp32c6-devkit" if ARCH_BOARD_ESP32C6_DEVKIT + default "esp32c6-devkitc" if ARCH_BOARD_ESP32C6_DEVKITC default "esp32c6-devkitm" if ARCH_BOARD_ESP32C6_DEVKITM default "esp32h2-devkit" if ARCH_BOARD_ESP32H2_DEVKIT default "et-stm32-stamp" if ARCH_BOARD_ET_STM32_STAMP @@ -4297,8 +4297,8 @@ endif if ARCH_BOARD_ESP32S3_BOX source "boards/xtensa/esp32s3/esp32s3-box/Kconfig" endif -#if ARCH_BOARD_ESP32C6_DEVKIT -#source "boards/risc-v/esp32c6/esp32c6-devkit/Kconfig" +#if ARCH_BOARD_ESP32C6_DEVKITC +#source "boards/risc-v/esp32c6/esp32c6-devkitc/Kconfig" #endif #if ARCH_BOARD_ESP32C6_DEVKITM #source "boards/risc-v/esp32c6/esp32c6-devkitm/Kconfig" diff --git a/boards/risc-v/esp32c6/esp32c6-devkit/Kconfig b/boards/risc-v/esp32c6/esp32c6-devkitc/Kconfig similarity index 67% rename from boards/risc-v/esp32c6/esp32c6-devkit/Kconfig rename to boards/risc-v/esp32c6/esp32c6-devkitc/Kconfig index 7db16a119d..e5a4b21549 100644 --- a/boards/risc-v/esp32c6/esp32c6-devkit/Kconfig +++ b/boards/risc-v/esp32c6/esp32c6-devkitc/Kconfig @@ -3,6 +3,6 @@ # see the file kconfig-language.txt in the NuttX tools repository. # -if ARCH_BOARD_ESP32C6_DEVKIT +if ARCH_BOARD_ESP32C6_DEVKITC -endif # ARCH_BOARD_ESP32C6_DEVKIT +endif # ARCH_BOARD_ESP32C6_DEVKITC diff --git a/boards/risc-v/esp32c6/esp32c6-devkit/configs/buttons/defconfig b/boards/risc-v/esp32c6/esp32c6-devkitc/configs/buttons/defconfig similarity index 92% rename from boards/risc-v/esp32c6/esp32c6-devkit/configs/buttons/defconfig rename to boards/risc-v/esp32c6/esp32c6-devkitc/configs/buttons/defconfig index 8dd05bcb4e..191455ae8c 100644 --- a/boards/risc-v/esp32c6/esp32c6-devkit/configs/buttons/defconfig +++ b/boards/risc-v/esp32c6/esp32c6-devkitc/configs/buttons/defconfig @@ -8,12 +8,13 @@ # CONFIG_NSH_ARGCAT is not set # CONFIG_NSH_CMDOPT_HEXDUMP is not set CONFIG_ARCH="risc-v" -CONFIG_ARCH_BOARD="esp32c6-devkit" +CONFIG_ARCH_BOARD="esp32c6-devkitc" CONFIG_ARCH_BOARD_COMMON=y -CONFIG_ARCH_BOARD_ESP32C6_DEVKIT=y +CONFIG_ARCH_BOARD_ESP32C6_DEVKITC=y CONFIG_ARCH_BUTTONS=y CONFIG_ARCH_CHIP="esp32c6" CONFIG_ARCH_CHIP_ESP32C6=y +CONFIG_ARCH_CHIP_ESP32C6WROOM1=y CONFIG_ARCH_INTERRUPTSTACK=2048 CONFIG_ARCH_IRQBUTTONS=y CONFIG_ARCH_RISCV=y diff --git a/boards/risc-v/esp32c6/esp32c6-devkit/configs/gpio/defconfig b/boards/risc-v/esp32c6/esp32c6-devkitc/configs/gpio/defconfig similarity index 92% rename from boards/risc-v/esp32c6/esp32c6-devkit/configs/gpio/defconfig rename to boards/risc-v/esp32c6/esp32c6-devkitc/configs/gpio/defconfig index e39b561781..3305fa6ed7 100644 --- a/boards/risc-v/esp32c6/esp32c6-devkit/configs/gpio/defconfig +++ b/boards/risc-v/esp32c6/esp32c6-devkitc/configs/gpio/defconfig @@ -8,11 +8,12 @@ # CONFIG_NSH_ARGCAT is not set # CONFIG_NSH_CMDOPT_HEXDUMP is not set CONFIG_ARCH="risc-v" -CONFIG_ARCH_BOARD="esp32c6-devkit" +CONFIG_ARCH_BOARD="esp32c6-devkitc" CONFIG_ARCH_BOARD_COMMON=y -CONFIG_ARCH_BOARD_ESP32C6_DEVKIT=y +CONFIG_ARCH_BOARD_ESP32C6_DEVKITC=y CONFIG_ARCH_CHIP="esp32c6" CONFIG_ARCH_CHIP_ESP32C6=y +CONFIG_ARCH_CHIP_ESP32C6WROOM1=y CONFIG_ARCH_INTERRUPTSTACK=2048 CONFIG_ARCH_RISCV=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/risc-v/esp32c6/esp32c6-devkit/configs/nsh/defconfig b/boards/risc-v/esp32c6/esp32c6-devkitc/configs/nsh/defconfig similarity index 92% rename from boards/risc-v/esp32c6/esp32c6-devkit/configs/nsh/defconfig rename to boards/risc-v/esp32c6/esp32c6-devkitc/configs/nsh/defconfig index 49e9027ce5..b1472b5bbb 100644 --- a/boards/risc-v/esp32c6/esp32c6-devkit/configs/nsh/defconfig +++ b/boards/risc-v/esp32c6/esp32c6-devkitc/configs/nsh/defconfig @@ -8,11 +8,12 @@ # CONFIG_NSH_ARGCAT is not set # CONFIG_NSH_CMDOPT_HEXDUMP is not set CONFIG_ARCH="risc-v" -CONFIG_ARCH_BOARD="esp32c6-devkit" +CONFIG_ARCH_BOARD="esp32c6-devkitc" CONFIG_ARCH_BOARD_COMMON=y -CONFIG_ARCH_BOARD_ESP32C6_DEVKIT=y +CONFIG_ARCH_BOARD_ESP32C6_DEVKITC=y CONFIG_ARCH_CHIP="esp32c6" CONFIG_ARCH_CHIP_ESP32C6=y +CONFIG_ARCH_CHIP_ESP32C6WROOM1=y CONFIG_ARCH_INTERRUPTSTACK=2048 CONFIG_ARCH_RISCV=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/risc-v/esp32c6/esp32c6-devkit/configs/ostest/defconfig b/boards/risc-v/esp32c6/esp32c6-devkitc/configs/ostest/defconfig similarity index 91% rename from boards/risc-v/esp32c6/esp32c6-devkit/configs/ostest/defconfig rename to boards/risc-v/esp32c6/esp32c6-devkitc/configs/ostest/defconfig index 2c92e04a82..4e6d27267b 100644 --- a/boards/risc-v/esp32c6/esp32c6-devkit/configs/ostest/defconfig +++ b/boards/risc-v/esp32c6/esp32c6-devkitc/configs/ostest/defconfig @@ -8,11 +8,12 @@ # CONFIG_NSH_ARGCAT is not set # CONFIG_NSH_CMDOPT_HEXDUMP is not set CONFIG_ARCH="risc-v" -CONFIG_ARCH_BOARD="esp32c6-devkit" +CONFIG_ARCH_BOARD="esp32c6-devkitc" CONFIG_ARCH_BOARD_COMMON=y -CONFIG_ARCH_BOARD_ESP32C6_DEVKIT=y +CONFIG_ARCH_BOARD_ESP32C6_DEVKITC=y CONFIG_ARCH_CHIP="esp32c6" CONFIG_ARCH_CHIP_ESP32C6=y +CONFIG_ARCH_CHIP_ESP32C6WROOM1=y CONFIG_ARCH_INTERRUPTSTACK=2048 CONFIG_ARCH_RISCV=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/risc-v/esp32c6/esp32c6-devkit/configs/pwm/defconfig b/boards/risc-v/esp32c6/esp32c6-devkitc/configs/pwm/defconfig similarity index 92% rename from boards/risc-v/esp32c6/esp32c6-devkit/configs/pwm/defconfig rename to boards/risc-v/esp32c6/esp32c6-devkitc/configs/pwm/defconfig index a73e3528b2..8d2ae63698 100644 --- a/boards/risc-v/esp32c6/esp32c6-devkit/configs/pwm/defconfig +++ b/boards/risc-v/esp32c6/esp32c6-devkitc/configs/pwm/defconfig @@ -8,11 +8,12 @@ # CONFIG_NSH_ARGCAT is not set # CONFIG_NSH_CMDOPT_HEXDUMP is not set CONFIG_ARCH="risc-v" -CONFIG_ARCH_BOARD="esp32c6-devkit" +CONFIG_ARCH_BOARD="esp32c6-devkitc" CONFIG_ARCH_BOARD_COMMON=y -CONFIG_ARCH_BOARD_ESP32C6_DEVKIT=y +CONFIG_ARCH_BOARD_ESP32C6_DEVKITC=y CONFIG_ARCH_CHIP="esp32c6" CONFIG_ARCH_CHIP_ESP32C6=y +CONFIG_ARCH_CHIP_ESP32C6WROOM1=y CONFIG_ARCH_INTERRUPTSTACK=2048 CONFIG_ARCH_RISCV=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/risc-v/esp32c6/esp32c6-devkit/configs/random/defconfig b/boards/risc-v/esp32c6/esp32c6-devkitc/configs/random/defconfig similarity index 92% rename from boards/risc-v/esp32c6/esp32c6-devkit/configs/random/defconfig rename to boards/risc-v/esp32c6/esp32c6-devkitc/configs/random/defconfig index 157d9a948c..dfb6e66ef2 100644 --- a/boards/risc-v/esp32c6/esp32c6-devkit/configs/random/defconfig +++ b/boards/risc-v/esp32c6/esp32c6-devkitc/configs/random/defconfig @@ -8,11 +8,12 @@ # CONFIG_NSH_ARGCAT is not set # CONFIG_NSH_CMDOPT_HEXDUMP is not set CONFIG_ARCH="risc-v" -CONFIG_ARCH_BOARD="esp32c6-devkit" +CONFIG_ARCH_BOARD="esp32c6-devkitc" CONFIG_ARCH_BOARD_COMMON=y -CONFIG_ARCH_BOARD_ESP32C6_DEVKIT=y +CONFIG_ARCH_BOARD_ESP32C6_DEVKITC=y CONFIG_ARCH_CHIP="esp32c6" CONFIG_ARCH_CHIP_ESP32C6=y +CONFIG_ARCH_CHIP_ESP32C6WROOM1=y CONFIG_ARCH_INTERRUPTSTACK=2048 CONFIG_ARCH_RISCV=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/risc-v/esp32c6/esp32c6-devkit/configs/rmt/defconfig b/boards/risc-v/esp32c6/esp32c6-devkitc/configs/rmt/defconfig similarity index 93% rename from boards/risc-v/esp32c6/esp32c6-devkit/configs/rmt/defconfig rename to boards/risc-v/esp32c6/esp32c6-devkitc/configs/rmt/defconfig index 742d400eb4..bc2256d9e4 100644 --- a/boards/risc-v/esp32c6/esp32c6-devkit/configs/rmt/defconfig +++ b/boards/risc-v/esp32c6/esp32c6-devkitc/configs/rmt/defconfig @@ -8,11 +8,12 @@ # CONFIG_NSH_ARGCAT is not set # CONFIG_NSH_CMDOPT_HEXDUMP is not set CONFIG_ARCH="risc-v" -CONFIG_ARCH_BOARD="esp32c6-devkit" +CONFIG_ARCH_BOARD="esp32c6-devkitc" CONFIG_ARCH_BOARD_COMMON=y -CONFIG_ARCH_BOARD_ESP32C6_DEVKIT=y +CONFIG_ARCH_BOARD_ESP32C6_DEVKITC=y CONFIG_ARCH_CHIP="esp32c6" CONFIG_ARCH_CHIP_ESP32C6=y +CONFIG_ARCH_CHIP_ESP32C6WROOM1=y CONFIG_ARCH_INTERRUPTSTACK=2048 CONFIG_ARCH_RISCV=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/risc-v/esp32c6/esp32c6-devkit/configs/rtc/defconfig b/boards/risc-v/esp32c6/esp32c6-devkitc/configs/rtc/defconfig similarity index 92% rename from boards/risc-v/esp32c6/esp32c6-devkit/configs/rtc/defconfig rename to boards/risc-v/esp32c6/esp32c6-devkitc/configs/rtc/defconfig index 7b7d6ad00c..44d530c386 100644 --- a/boards/risc-v/esp32c6/esp32c6-devkit/configs/rtc/defconfig +++ b/boards/risc-v/esp32c6/esp32c6-devkitc/configs/rtc/defconfig @@ -8,11 +8,12 @@ # CONFIG_NSH_ARGCAT is not set # CONFIG_NSH_CMDOPT_HEXDUMP is not set CONFIG_ARCH="risc-v" -CONFIG_ARCH_BOARD="esp32c6-devkit" +CONFIG_ARCH_BOARD="esp32c6-devkitc" CONFIG_ARCH_BOARD_COMMON=y -CONFIG_ARCH_BOARD_ESP32C6_DEVKIT=y +CONFIG_ARCH_BOARD_ESP32C6_DEVKITC=y CONFIG_ARCH_CHIP="esp32c6" CONFIG_ARCH_CHIP_ESP32C6=y +CONFIG_ARCH_CHIP_ESP32C6WROOM1=y CONFIG_ARCH_INTERRUPTSTACK=1536 CONFIG_ARCH_RISCV=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/risc-v/esp32c6/esp32c6-devkit/configs/spiflash/defconfig b/boards/risc-v/esp32c6/esp32c6-devkitc/configs/spiflash/defconfig similarity index 93% rename from boards/risc-v/esp32c6/esp32c6-devkit/configs/spiflash/defconfig rename to boards/risc-v/esp32c6/esp32c6-devkitc/configs/spiflash/defconfig index 814200948a..34d7c0826a 100644 --- a/boards/risc-v/esp32c6/esp32c6-devkit/configs/spiflash/defconfig +++ b/boards/risc-v/esp32c6/esp32c6-devkitc/configs/spiflash/defconfig @@ -8,11 +8,12 @@ # CONFIG_NSH_ARGCAT is not set # CONFIG_NSH_CMDOPT_HEXDUMP is not set CONFIG_ARCH="risc-v" -CONFIG_ARCH_BOARD="esp32c6-devkit" +CONFIG_ARCH_BOARD="esp32c6-devkitc" CONFIG_ARCH_BOARD_COMMON=y -CONFIG_ARCH_BOARD_ESP32C6_DEVKIT=y +CONFIG_ARCH_BOARD_ESP32C6_DEVKITC=y CONFIG_ARCH_CHIP="esp32c6" CONFIG_ARCH_CHIP_ESP32C6=y +CONFIG_ARCH_CHIP_ESP32C6WROOM1=y CONFIG_ARCH_INTERRUPTSTACK=2048 CONFIG_ARCH_RISCV=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/risc-v/esp32c6/esp32c6-devkit/configs/tickless/defconfig b/boards/risc-v/esp32c6/esp32c6-devkitc/configs/tickless/defconfig similarity index 92% rename from boards/risc-v/esp32c6/esp32c6-devkit/configs/tickless/defconfig rename to boards/risc-v/esp32c6/esp32c6-devkitc/configs/tickless/defconfig index 1a4170be1b..863b898148 100644 --- a/boards/risc-v/esp32c6/esp32c6-devkit/configs/tickless/defconfig +++ b/boards/risc-v/esp32c6/esp32c6-devkitc/configs/tickless/defconfig @@ -8,11 +8,12 @@ # CONFIG_NSH_ARGCAT is not set # CONFIG_NSH_CMDOPT_HEXDUMP is not set CONFIG_ARCH="risc-v" -CONFIG_ARCH_BOARD="esp32c6-devkit" +CONFIG_ARCH_BOARD="esp32c6-devkitc" CONFIG_ARCH_BOARD_COMMON=y -CONFIG_ARCH_BOARD_ESP32C6_DEVKIT=y +CONFIG_ARCH_BOARD_ESP32C6_DEVKITC=y CONFIG_ARCH_CHIP="esp32c6" CONFIG_ARCH_CHIP_ESP32C6=y +CONFIG_ARCH_CHIP_ESP32C6WROOM1=y CONFIG_ARCH_INTERRUPTSTACK=2048 CONFIG_ARCH_RISCV=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/risc-v/esp32c6/esp32c6-devkit/configs/timers/defconfig b/boards/risc-v/esp32c6/esp32c6-devkitc/configs/timers/defconfig similarity index 92% rename from boards/risc-v/esp32c6/esp32c6-devkit/configs/timers/defconfig rename to boards/risc-v/esp32c6/esp32c6-devkitc/configs/timers/defconfig index 286c12139d..1c1443314c 100644 --- a/boards/risc-v/esp32c6/esp32c6-devkit/configs/timers/defconfig +++ b/boards/risc-v/esp32c6/esp32c6-devkitc/configs/timers/defconfig @@ -8,11 +8,12 @@ # CONFIG_NSH_ARGCAT is not set # CONFIG_NSH_CMDOPT_HEXDUMP is not set CONFIG_ARCH="risc-v" -CONFIG_ARCH_BOARD="esp32c6-devkit" +CONFIG_ARCH_BOARD="esp32c6-devkitc" CONFIG_ARCH_BOARD_COMMON=y -CONFIG_ARCH_BOARD_ESP32C6_DEVKIT=y +CONFIG_ARCH_BOARD_ESP32C6_DEVKITC=y CONFIG_ARCH_CHIP="esp32c6" CONFIG_ARCH_CHIP_ESP32C6=y +CONFIG_ARCH_CHIP_ESP32C6WROOM1=y CONFIG_ARCH_INTERRUPTSTACK=1536 CONFIG_ARCH_RISCV=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/risc-v/esp32c6/esp32c6-devkit/configs/usbconsole/defconfig b/boards/risc-v/esp32c6/esp32c6-devkitc/configs/usbconsole/defconfig similarity index 92% rename from boards/risc-v/esp32c6/esp32c6-devkit/configs/usbconsole/defconfig rename to boards/risc-v/esp32c6/esp32c6-devkitc/configs/usbconsole/defconfig index 0bba6e4d40..fd54523bd2 100644 --- a/boards/risc-v/esp32c6/esp32c6-devkit/configs/usbconsole/defconfig +++ b/boards/risc-v/esp32c6/esp32c6-devkitc/configs/usbconsole/defconfig @@ -9,11 +9,12 @@ # CONFIG_NSH_ARGCAT is not set # CONFIG_NSH_CMDOPT_HEXDUMP is not set CONFIG_ARCH="risc-v" -CONFIG_ARCH_BOARD="esp32c6-devkit" +CONFIG_ARCH_BOARD="esp32c6-devkitc" CONFIG_ARCH_BOARD_COMMON=y -CONFIG_ARCH_BOARD_ESP32C6_DEVKIT=y +CONFIG_ARCH_BOARD_ESP32C6_DEVKITC=y CONFIG_ARCH_CHIP="esp32c6" CONFIG_ARCH_CHIP_ESP32C6=y +CONFIG_ARCH_CHIP_ESP32C6WROOM1=y CONFIG_ARCH_INTERRUPTSTACK=2048 CONFIG_ARCH_RISCV=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/risc-v/esp32c6/esp32c6-devkit/configs/watchdog/defconfig b/boards/risc-v/esp32c6/esp32c6-devkitc/configs/watchdog/defconfig similarity index 92% rename from boards/risc-v/esp32c6/esp32c6-devkit/configs/watchdog/defconfig rename to boards/risc-v/esp32c6/esp32c6-devkitc/configs/watchdog/defconfig index 572ddf606e..5f8f895242 100644 --- a/boards/risc-v/esp32c6/esp32c6-devkit/configs/watchdog/defconfig +++ b/boards/risc-v/esp32c6/esp32c6-devkitc/configs/watchdog/defconfig @@ -8,11 +8,12 @@ # CONFIG_NSH_ARGCAT is not set # CONFIG_NSH_CMDOPT_HEXDUMP is not set CONFIG_ARCH="risc-v" -CONFIG_ARCH_BOARD="esp32c6-devkit" +CONFIG_ARCH_BOARD="esp32c6-devkitc" CONFIG_ARCH_BOARD_COMMON=y -CONFIG_ARCH_BOARD_ESP32C6_DEVKIT=y +CONFIG_ARCH_BOARD_ESP32C6_DEVKITC=y CONFIG_ARCH_CHIP="esp32c6" CONFIG_ARCH_CHIP_ESP32C6=y +CONFIG_ARCH_CHIP_ESP32C6WROOM1=y CONFIG_ARCH_INTERRUPTSTACK=2048 CONFIG_ARCH_RISCV=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/risc-v/esp32c6/esp32c6-devkit/include/board.h b/boards/risc-v/esp32c6/esp32c6-devkitc/include/board.h similarity index 85% rename from boards/risc-v/esp32c6/esp32c6-devkit/include/board.h rename to boards/risc-v/esp32c6/esp32c6-devkitc/include/board.h index fbea1a6556..bccce6531c 100644 --- a/boards/risc-v/esp32c6/esp32c6-devkit/include/board.h +++ b/boards/risc-v/esp32c6/esp32c6-devkitc/include/board.h @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/risc-v/esp32c6/esp32c6-devkit/include/board.h + * boards/risc-v/esp32c6/esp32c6-devkitc/include/board.h * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_RISCV_ESP32C6_ESP32C6_DEVKIT_INCLUDE_BOARD_H -#define __BOARDS_RISCV_ESP32C6_ESP32C6_DEVKIT_INCLUDE_BOARD_H +#ifndef __BOARDS_RISCV_ESP32C6_ESP32C6_DEVKITC_INCLUDE_BOARD_H +#define __BOARDS_RISCV_ESP32C6_ESP32C6_DEVKITC_INCLUDE_BOARD_H /**************************************************************************** * Pre-processor Definitions @@ -36,5 +36,5 @@ #define BUTTON_BOOT 9 -#endif /* __BOARDS_RISCV_ESP32C6_ESP32C6_DEVKIT_INCLUDE_BOARD_H */ +#endif /* __BOARDS_RISCV_ESP32C6_ESP32C6_DEVKITC_INCLUDE_BOARD_H */ diff --git a/boards/risc-v/esp32c6/esp32c6-devkit/scripts/Make.defs b/boards/risc-v/esp32c6/esp32c6-devkitc/scripts/Make.defs similarity index 97% rename from boards/risc-v/esp32c6/esp32c6-devkit/scripts/Make.defs rename to boards/risc-v/esp32c6/esp32c6-devkitc/scripts/Make.defs index 38fa38b762..0402a2c36f 100644 --- a/boards/risc-v/esp32c6/esp32c6-devkit/scripts/Make.defs +++ b/boards/risc-v/esp32c6/esp32c6-devkitc/scripts/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# boards/risc-v/esp32c6/esp32c6-devkit/scripts/Make.defs +# boards/risc-v/esp32c6/esp32c6-devkitc/scripts/Make.defs # # Licensed to the Apache Software Foundation (ASF) under one or more # contributor license agreements. See the NOTICE file distributed with diff --git a/boards/risc-v/esp32c6/esp32c6-devkit/src/Make.defs b/boards/risc-v/esp32c6/esp32c6-devkitc/src/Make.defs similarity index 96% rename from boards/risc-v/esp32c6/esp32c6-devkit/src/Make.defs rename to boards/risc-v/esp32c6/esp32c6-devkitc/src/Make.defs index 4de110b7d3..700ca6648a 100644 --- a/boards/risc-v/esp32c6/esp32c6-devkit/src/Make.defs +++ b/boards/risc-v/esp32c6/esp32c6-devkitc/src/Make.defs @@ -1,5 +1,5 @@ ############################################################################# -# boards/risc-v/esp32c6/esp32c6-devkit/src/Make.defs +# boards/risc-v/esp32c6/esp32c6-devkitc/src/Make.defs # # Licensed to the Apache Software Foundation (ASF) under one or more # contributor license agreements. See the NOTICE file distributed with diff --git a/boards/risc-v/esp32c6/esp32c6-devkit/src/esp32c6-devkit.h b/boards/risc-v/esp32c6/esp32c6-devkitc/src/esp32c6-devkitc.h similarity index 91% rename from boards/risc-v/esp32c6/esp32c6-devkit/src/esp32c6-devkit.h rename to boards/risc-v/esp32c6/esp32c6-devkitc/src/esp32c6-devkitc.h index b47e5acc64..204fd63b80 100644 --- a/boards/risc-v/esp32c6/esp32c6-devkit/src/esp32c6-devkit.h +++ b/boards/risc-v/esp32c6/esp32c6-devkitc/src/esp32c6-devkitc.h @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/risc-v/esp32c6/esp32c6-devkit/src/esp32c6-devkit.h + * boards/risc-v/esp32c6/esp32c6-devkitc/src/esp32c6-devkitc.h * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_RISCV_ESP32C6_ESP32C6_DEVKIT_SRC_ESP32C6_DEVKIT_H -#define __BOARDS_RISCV_ESP32C6_ESP32C6_DEVKIT_SRC_ESP32C6_DEVKIT_H +#ifndef __BOARDS_RISCV_ESP32C6_ESP32C6_DEVKITC_SRC_ESP32C6_DEVKITC_H +#define __BOARDS_RISCV_ESP32C6_ESP32C6_DEVKITC_SRC_ESP32C6_DEVKITC_H /**************************************************************************** * Included Files @@ -97,4 +97,4 @@ int esp_gpio_init(void); #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_RISCV_ESP32C6_ESP32C6_DEVKIT_SRC_ESP32C6_DEVKIT_H */ +#endif /* __BOARDS_RISCV_ESP32C6_ESP32C6_DEVKITC_SRC_ESP32C6_DEVKITC_H */ diff --git a/boards/risc-v/esp32c6/esp32c6-devkit/src/esp32c6_appinit.c b/boards/risc-v/esp32c6/esp32c6-devkitc/src/esp32c6_appinit.c similarity index 97% rename from boards/risc-v/esp32c6/esp32c6-devkit/src/esp32c6_appinit.c rename to boards/risc-v/esp32c6/esp32c6-devkitc/src/esp32c6_appinit.c index 47472cda4d..0795f4564a 100644 --- a/boards/risc-v/esp32c6/esp32c6-devkit/src/esp32c6_appinit.c +++ b/boards/risc-v/esp32c6/esp32c6-devkitc/src/esp32c6_appinit.c @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/risc-v/esp32c6/esp32c6-devkit/src/esp32c6_appinit.c + * boards/risc-v/esp32c6/esp32c6-devkitc/src/esp32c6_appinit.c * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -28,7 +28,7 @@ #include <nuttx/board.h> -#include "esp32c6-devkit.h" +#include "esp32c6-devkitc.h" #ifdef CONFIG_BOARDCTL diff --git a/boards/risc-v/esp32c6/esp32c6-devkit/src/esp32c6_boot.c b/boards/risc-v/esp32c6/esp32c6-devkitc/src/esp32c6_boot.c similarity index 98% rename from boards/risc-v/esp32c6/esp32c6-devkit/src/esp32c6_boot.c rename to boards/risc-v/esp32c6/esp32c6-devkitc/src/esp32c6_boot.c index c1efc4ec02..bf3b3cac14 100644 --- a/boards/risc-v/esp32c6/esp32c6-devkit/src/esp32c6_boot.c +++ b/boards/risc-v/esp32c6/esp32c6-devkitc/src/esp32c6_boot.c @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/risc-v/esp32c6/esp32c6-devkit/src/esp32c6_boot.c + * boards/risc-v/esp32c6/esp32c6-devkitc/src/esp32c6_boot.c * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with diff --git a/boards/risc-v/esp32c6/esp32c6-devkit/src/esp32c6_bringup.c b/boards/risc-v/esp32c6/esp32c6-devkitc/src/esp32c6_bringup.c similarity index 98% rename from boards/risc-v/esp32c6/esp32c6-devkit/src/esp32c6_bringup.c rename to boards/risc-v/esp32c6/esp32c6-devkitc/src/esp32c6_bringup.c index 8e2477d839..8420c76ad8 100644 --- a/boards/risc-v/esp32c6/esp32c6-devkit/src/esp32c6_bringup.c +++ b/boards/risc-v/esp32c6/esp32c6-devkitc/src/esp32c6_bringup.c @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/risc-v/esp32c6/esp32c6-devkit/src/esp32c6_bringup.c + * boards/risc-v/esp32c6/esp32c6-devkitc/src/esp32c6_bringup.c * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -65,7 +65,7 @@ # include "esp_board_rmt.h" #endif -#include "esp32c6-devkit.h" +#include "esp32c6-devkitc.h" /**************************************************************************** * Pre-processor Definitions diff --git a/boards/risc-v/esp32c6/esp32c6-devkit/src/esp32c6_buttons.c b/boards/risc-v/esp32c6/esp32c6-devkitc/src/esp32c6_buttons.c similarity index 98% rename from boards/risc-v/esp32c6/esp32c6-devkit/src/esp32c6_buttons.c rename to boards/risc-v/esp32c6/esp32c6-devkitc/src/esp32c6_buttons.c index 57598946fd..d73973070a 100644 --- a/boards/risc-v/esp32c6/esp32c6-devkit/src/esp32c6_buttons.c +++ b/boards/risc-v/esp32c6/esp32c6-devkitc/src/esp32c6_buttons.c @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/risc-v/esp32c6/esp32c6-devkit/src/esp32c6_buttons.c + * boards/risc-v/esp32c6/esp32c6-devkitc/src/esp32c6_buttons.c * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -47,7 +47,7 @@ /* Board */ -#include "esp32c6-devkit.h" +#include "esp32c6-devkitc.h" #include <arch/board/board.h> /**************************************************************************** diff --git a/boards/risc-v/esp32c6/esp32c6-devkit/src/esp32c6_gpio.c b/boards/risc-v/esp32c6/esp32c6-devkitc/src/esp32c6_gpio.c similarity index 99% rename from boards/risc-v/esp32c6/esp32c6-devkit/src/esp32c6_gpio.c rename to boards/risc-v/esp32c6/esp32c6-devkitc/src/esp32c6_gpio.c index 9cb3a8ca0a..f6a1dd88ed 100644 --- a/boards/risc-v/esp32c6/esp32c6-devkit/src/esp32c6_gpio.c +++ b/boards/risc-v/esp32c6/esp32c6-devkitc/src/esp32c6_gpio.c @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/risc-v/esp32c6/esp32c6-devkit/src/esp32c6_gpio.c + * boards/risc-v/esp32c6/esp32c6-devkitc/src/esp32c6_gpio.c * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -45,7 +45,7 @@ /* Board */ -#include "esp32c6-devkit.h" +#include "esp32c6-devkitc.h" #include <arch/board/board.h> /* HAL */ diff --git a/boards/risc-v/esp32c6/esp32c6-devkit/src/esp32c6_reset.c b/boards/risc-v/esp32c6/esp32c6-devkitc/src/esp32c6_reset.c similarity index 97% rename from boards/risc-v/esp32c6/esp32c6-devkit/src/esp32c6_reset.c rename to boards/risc-v/esp32c6/esp32c6-devkitc/src/esp32c6_reset.c index 024764c5a2..c6bfb5a94f 100644 --- a/boards/risc-v/esp32c6/esp32c6-devkit/src/esp32c6_reset.c +++ b/boards/risc-v/esp32c6/esp32c6-devkitc/src/esp32c6_reset.c @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/risc-v/esp32c6/esp32c6-devkit/src/esp32c6_reset.c + * boards/risc-v/esp32c6/esp32c6-devkitc/src/esp32c6_reset.c * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with
