This is an automated email from the ASF dual-hosted git repository.
jerpelea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit d1db1810add5c280489a4782a067249a806a6596
Author: Eren Terzioglu <eren.terzio...@espressif.com>
AuthorDate: Mon Jan 8 11:26:14 2024 +0300
risc-v/espressif: Rename espressif/esp32c3 as esp32c3
risc-v/espressif: Rename espressif/esp32c6 as esp32c6
risc-v/espressif: Rename espressif/esp32h2 as esp32h2
---
arch/risc-v/Kconfig | 129 ++++++++++++++++++---
.../include/{espressif => esp32c3}/.gitignore | 0
arch/risc-v/include/{espressif => esp32c3}/chip.h | 8 +-
.../include/{espressif => esp32c6}/.gitignore | 0
arch/risc-v/include/{espressif => esp32c6}/chip.h | 8 +-
.../include/{espressif => esp32h2}/.gitignore | 0
arch/risc-v/include/{espressif => esp32h2}/chip.h | 8 +-
arch/risc-v/src/{ => common}/espressif/.gitignore | 0
arch/risc-v/src/{ => common}/espressif/Kconfig | 74 +-----------
arch/risc-v/src/common/espressif/Make.defs | 40 +++++++
arch/risc-v/src/common/espressif/esp_vectors.S | 1 -
arch/risc-v/src/{espressif => esp32c3}/.gitignore | 0
.../risc-v/src/esp32c3}/Kconfig | 6 +-
.../src => arch/risc-v/src/esp32c3}/Make.defs | 19 +--
.../src/{espressif => esp32c3}/hal_esp32c3.mk | 2 +-
arch/risc-v/src/{espressif => esp32c6}/.gitignore | 0
.../risc-v/src/esp32c6}/Kconfig | 6 +-
.../src => arch/risc-v/src/esp32c6}/Make.defs | 19 +--
.../src/{espressif => esp32c6}/hal_esp32c6.mk | 2 +-
arch/risc-v/src/{espressif => esp32h2}/.gitignore | 0
.../risc-v/src/esp32h2}/Kconfig | 6 +-
.../src => arch/risc-v/src/esp32h2}/Make.defs | 19 +--
.../src/{espressif => esp32h2}/hal_esp32h2.mk | 2 +-
arch/risc-v/src/espressif/Make.defs | 62 ----------
boards/Kconfig | 38 +++---
.../risc-v/{espressif => esp32c3}/common/Kconfig | 0
.../risc-v/{espressif => esp32c3}/common/Makefile | 2 +-
.../common/include/esp_board_ledc.h | 8 +-
.../common/scripts/.gitignore | 0
.../common/scripts/common.ld | 2 +-
.../common/scripts/esp32c3_aliases.ld | 2 +-
.../common/scripts/esp32c3_flat_memory.ld | 2 +-
.../common/scripts/esp32c3_legacy_sections.ld | 2 +-
.../common/scripts/esp32c3_mcuboot_sections.ld | 2 +-
.../common/scripts/esp32c3_simple_boot_sections.ld | 1 -
.../{espressif => esp32c3}/common/src/Make.defs | 2 +-
.../common/src/esp_board_ledc.c | 2 +-
.../{espressif => esp32c3}/esp32c3-generic/Kconfig | 0
.../esp32c3-generic/configs/buttons/defconfig | 4 +-
.../esp32c3-generic/configs/gpio/defconfig | 4 +-
.../esp32c3-generic/configs/mcuboot_nsh/defconfig | 4 +-
.../esp32c3-generic/configs/nsh/defconfig | 4 +-
.../esp32c3-generic/configs/pwm/defconfig | 4 +-
.../esp32c3-generic/configs/random/defconfig | 4 +-
.../esp32c3-generic/configs/rtc/defconfig | 4 +-
.../esp32c3-generic/configs/tickless/defconfig | 4 +-
.../esp32c3-generic/configs/timers/defconfig | 4 +-
.../esp32c3-generic/configs/usbconsole/defconfig | 4 +-
.../esp32c3-generic/configs/watchdog/defconfig | 4 +-
.../esp32c3-generic/include/board.h | 8 +-
.../esp32c3-generic/scripts/Make.defs | 2 +-
.../esp32c3-generic/src/Make.defs | 2 +-
.../esp32c3-generic/src/esp32c3-generic.h | 8 +-
.../esp32c3-generic/src/esp32c3_appinit.c | 2 +-
.../esp32c3-generic/src/esp32c3_boot.c | 2 +-
.../esp32c3-generic/src/esp32c3_bringup.c | 2 +-
.../esp32c3-generic/src/esp32c3_buttons.c | 2 +-
.../esp32c3-generic/src/esp32c3_gpio.c | 2 +-
.../esp32c3-generic/src/esp32c3_reset.c | 2 +-
.../risc-v/{espressif => esp32c6}/common/Kconfig | 0
.../risc-v/{espressif => esp32c6}/common/Makefile | 2 +-
.../common/include/esp_board_ledc.h | 8 +-
.../common/scripts/.gitignore | 0
.../common/scripts/common.ld | 2 +-
.../common/scripts/esp32c6_aliases.ld | 2 +-
.../common/scripts/esp32c6_flat_memory.ld | 2 +-
.../common/scripts/esp32c6_legacy_sections.ld | 2 +-
.../{espressif => esp32c6}/common/src/Make.defs | 2 +-
.../common/src/esp_board_ledc.c | 2 +-
.../esp32c6-devkit}/Kconfig | 4 +-
.../esp32c6-devkit}/configs/buttons/defconfig | 8 +-
.../esp32c6-devkit}/configs/gpio/defconfig | 8 +-
.../esp32c6-devkit}/configs/nsh/defconfig | 8 +-
.../esp32c6-devkit}/configs/ostest/defconfig | 8 +-
.../esp32c6-devkit}/configs/pwm/defconfig | 8 +-
.../esp32c6-devkit}/configs/random/defconfig | 8 +-
.../esp32c6-devkit}/configs/rtc/defconfig | 8 +-
.../esp32c6-devkit/configs/sotest}/defconfig | 16 ++-
.../esp32c6-devkit}/configs/tickless/defconfig | 8 +-
.../esp32c6-devkit}/configs/timers/defconfig | 8 +-
.../esp32c6-devkit}/configs/usbconsole/defconfig | 8 +-
.../esp32c6-devkit}/configs/watchdog/defconfig | 8 +-
.../esp32c6-devkit}/include/board.h | 8 +-
.../esp32c6-devkit}/scripts/Make.defs | 2 +-
.../esp32c6-devkit}/src/Make.defs | 2 +-
.../esp32c6-devkit/src/esp32c6-devkit.h} | 8 +-
.../esp32c6-devkit}/src/esp32c6_appinit.c | 4 +-
.../esp32c6-devkit}/src/esp32c6_boot.c | 2 +-
.../esp32c6-devkit}/src/esp32c6_bringup.c | 4 +-
.../esp32c6-devkit}/src/esp32c6_buttons.c | 4 +-
.../esp32c6-devkit}/src/esp32c6_gpio.c | 4 +-
.../esp32c6-devkit}/src/esp32c6_reset.c | 2 +-
.../risc-v/{espressif => esp32h2}/common/Kconfig | 0
.../risc-v/{espressif => esp32h2}/common/Makefile | 2 +-
.../common/include/esp_board_ledc.h | 8 +-
.../common/scripts/.gitignore | 0
.../common/scripts/common.ld | 2 +-
.../common/scripts/esp32h2_aliases.ld | 2 +-
.../common/scripts/esp32h2_flat_memory.ld | 2 +-
.../common/scripts/esp32h2_legacy_sections.ld | 2 +-
.../{espressif => esp32h2}/common/src/Make.defs | 2 +-
.../common/src/esp_board_ledc.c | 2 +-
.../esp32h2-devkit}/Kconfig | 0
.../esp32h2-devkit}/configs/buttons/defconfig | 8 +-
.../esp32h2-devkit}/configs/gpio/defconfig | 8 +-
.../esp32h2-devkit}/configs/nsh/defconfig | 8 +-
.../esp32h2-devkit}/configs/pwm/defconfig | 8 +-
.../esp32h2-devkit}/configs/random/defconfig | 8 +-
.../esp32h2-devkit}/configs/rtc/defconfig | 8 +-
.../esp32h2-devkit}/configs/tickless/defconfig | 8 +-
.../esp32h2-devkit}/configs/timers/defconfig | 8 +-
.../esp32h2-devkit}/configs/usbconsole/defconfig | 8 +-
.../esp32h2-devkit}/configs/watchdog/defconfig | 8 +-
.../esp32h2-devkit}/include/board.h | 8 +-
.../esp32h2-devkit}/scripts/Make.defs | 2 +-
.../esp32h2-devkit}/src/Make.defs | 2 +-
.../esp32h2-devkit/src/esp32h2-devkit.h} | 8 +-
.../esp32h2-devkit}/src/esp32h2_appinit.c | 4 +-
.../esp32h2-devkit}/src/esp32h2_boot.c | 2 +-
.../esp32h2-devkit}/src/esp32h2_bringup.c | 4 +-
.../esp32h2-devkit}/src/esp32h2_buttons.c | 4 +-
.../esp32h2-devkit}/src/esp32h2_gpio.c | 4 +-
.../esp32h2-devkit}/src/esp32h2_reset.c | 2 +-
123 files changed, 420 insertions(+), 442 deletions(-)
diff --git a/arch/risc-v/Kconfig b/arch/risc-v/Kconfig
index 10274ceaca..f0d60a4074 100644
--- a/arch/risc-v/Kconfig
+++ b/arch/risc-v/Kconfig
@@ -90,10 +90,93 @@ config ARCH_CHIP_ESP32C3
---help---
Espressif ESP32-C3 (RV32IMC).
-config ARCH_CHIP_ESPRESSIF
- bool "Espressif ESP32 family"
+config ARCH_CHIP_ESP32C3_GENERIC
+ bool "ESP32-C3"
+ select ARCH_RV32
+ select ARCH_RV_ISA_M
+ select ARCH_RV_ISA_C
+ select ARCH_VECNOTIRQ
+ select ARCH_HAVE_BOOTLOADER if !ESPRESSIF_SIMPLE_BOOT
+ select ARCH_HAVE_MPU
+ select ARCH_HAVE_RESET
+ select ARCH_HAVE_RNG
+ select ARCH_HAVE_TICKLESS
+ select LIBC_ARCH_ATOMIC
+ select LIBC_ARCH_MEMCPY
+ select LIBC_ARCH_MEMCHR
+ select LIBC_ARCH_MEMCMP
+ select LIBC_ARCH_MEMMOVE
+ select LIBC_ARCH_MEMSET
+ select LIBC_ARCH_STRCHR
+ select LIBC_ARCH_STRCMP
+ select LIBC_ARCH_STRCPY
+ select LIBC_ARCH_STRLCPY
+ select LIBC_ARCH_STRNCPY
+ select LIBC_ARCH_STRLEN
+ select LIBC_ARCH_STRNLEN
+ select ESPRESSIF_SOC_RTC_MEM_SUPPORTED
+ select ARCH_CHIP_ESPRESSIF
+ ---help---
+ ESP32-C3 chip with a single RISC-V IMC core, no embedded Flash
memory
+
+config ARCH_CHIP_ESP32C6
+ bool "ESP32-C6"
+ select ARCH_RV32
+ select ARCH_RV_ISA_M
+ select ARCH_RV_ISA_A
+ select ARCH_RV_ISA_C
+ select ARCH_VECNOTIRQ
+ select ARCH_HAVE_BOOTLOADER
+ select ARCH_HAVE_MPU
+ select ARCH_HAVE_RESET
+ select ARCH_HAVE_RNG
+ select ARCH_HAVE_TICKLESS
+ select LIBC_ARCH_MEMCPY
+ select LIBC_ARCH_MEMCHR
+ select LIBC_ARCH_MEMCMP
+ select LIBC_ARCH_MEMMOVE
+ select LIBC_ARCH_MEMSET
+ select LIBC_ARCH_STRCHR
+ select LIBC_ARCH_STRCMP
+ select LIBC_ARCH_STRCPY
+ select LIBC_ARCH_STRLCPY
+ select LIBC_ARCH_STRNCPY
+ select LIBC_ARCH_STRLEN
+ select LIBC_ARCH_STRNLEN
+ select ESPRESSIF_SOC_RTC_MEM_SUPPORTED
+ select ARCH_CHIP_ESPRESSIF
+ ---help---
+ Espressif ESP32-C6 (RV32IMAC).
+
+config ARCH_CHIP_ESP32H2
+ bool "ESP32-H2"
+ select ARCH_RV32
+ select ARCH_RV_ISA_M
+ select ARCH_RV_ISA_C
+ select ARCH_VECNOTIRQ
+ select ARCH_HAVE_BOOTLOADER
+ select ARCH_HAVE_MPU
+ select ARCH_HAVE_RESET
+ select ARCH_HAVE_RNG
+ select ARCH_HAVE_TICKLESS
+ select LIBC_ARCH_ATOMIC
+ select LIBC_ARCH_MEMCPY
+ select LIBC_ARCH_MEMCHR
+ select LIBC_ARCH_MEMCMP
+ select LIBC_ARCH_MEMMOVE
+ select LIBC_ARCH_MEMSET
+ select LIBC_ARCH_STRCHR
+ select LIBC_ARCH_STRCMP
+ select LIBC_ARCH_STRCPY
+ select LIBC_ARCH_STRLCPY
+ select LIBC_ARCH_STRNCPY
+ select LIBC_ARCH_STRLEN
+ select LIBC_ARCH_STRNLEN
+ select ESPRESSIF_ESPTOOLPY_NO_STUB
+ select ESPRESSIF_SOC_RTC_MEM_SUPPORTED
+ select ARCH_CHIP_ESPRESSIF
---help---
- Family of RISC-V based microcontrollers from Espressif Systems.
+ Espressif ESP32-H2 (RV32IMC).
config ARCH_CHIP_C906
bool "THEAD C906"
@@ -304,20 +387,22 @@ config ARCH_FAMILY
config ARCH_CHIP
string
- default "fe310" if ARCH_CHIP_FE310
- default "k210" if ARCH_CHIP_K210
- default "litex" if ARCH_CHIP_LITEX
- default "bl602" if ARCH_CHIP_BL602
- default "esp32c3-legacy" if ARCH_CHIP_ESP32C3
- default "espressif" if ARCH_CHIP_ESPRESSIF
- default "c906" if ARCH_CHIP_C906
- default "mpfs" if ARCH_CHIP_MPFS
- default "rv32m1" if ARCH_CHIP_RV32M1
- default "qemu-rv" if ARCH_CHIP_QEMU_RV
- default "hpm6750" if ARCH_CHIP_HPM6750
- default "jh7110" if ARCH_CHIP_JH7110
- default "bl808" if ARCH_CHIP_BL808
- default "k230" if ARCH_CHIP_K230
+ default "fe310" if ARCH_CHIP_FE310
+ default "k210" if ARCH_CHIP_K210
+ default "litex" if ARCH_CHIP_LITEX
+ default "bl602" if ARCH_CHIP_BL602
+ default "esp32c3-legacy" if ARCH_CHIP_ESP32C3
+ default "esp32c3" if
ARCH_CHIP_ESP32C3_GENERIC
+ default "esp32c6" if ARCH_CHIP_ESP32C6
+ default "esp32h2" if ARCH_CHIP_ESP32H2
+ default "c906" if ARCH_CHIP_C906
+ default "mpfs" if ARCH_CHIP_MPFS
+ default "rv32m1" if ARCH_CHIP_RV32M1
+ default "qemu-rv" if ARCH_CHIP_QEMU_RV
+ default "hpm6750" if ARCH_CHIP_HPM6750
+ default "jh7110" if ARCH_CHIP_JH7110
+ default "bl808" if ARCH_CHIP_BL808
+ default "k230" if ARCH_CHIP_K230
config ARCH_RISCV_INTXCPT_EXTENSIONS
bool "RISC-V Integer Context Extensions"
@@ -460,8 +545,14 @@ endif
if ARCH_CHIP_ESP32C3
source "arch/risc-v/src/esp32c3-legacy/Kconfig"
endif
-if ARCH_CHIP_ESPRESSIF
-source "arch/risc-v/src/espressif/Kconfig"
+if ARCH_CHIP_ESP32C3_GENERIC
+source "arch/risc-v/src/esp32c3/Kconfig"
+endif
+if ARCH_CHIP_ESP32C6
+source "arch/risc-v/src/esp32c6/Kconfig"
+endif
+if ARCH_CHIP_ESP32H2
+source "arch/risc-v/src/esp32h2/Kconfig"
endif
if ARCH_CHIP_C906
source "arch/risc-v/src/c906/Kconfig"
diff --git a/arch/risc-v/include/espressif/.gitignore
b/arch/risc-v/include/esp32c3/.gitignore
similarity index 100%
copy from arch/risc-v/include/espressif/.gitignore
copy to arch/risc-v/include/esp32c3/.gitignore
diff --git a/arch/risc-v/include/espressif/chip.h
b/arch/risc-v/include/esp32c3/chip.h
similarity index 87%
copy from arch/risc-v/include/espressif/chip.h
copy to arch/risc-v/include/esp32c3/chip.h
index 58e4ba5435..44938d956c 100644
--- a/arch/risc-v/include/espressif/chip.h
+++ b/arch/risc-v/include/esp32c3/chip.h
@@ -1,5 +1,5 @@
/****************************************************************************
- * arch/risc-v/include/espressif/chip.h
+ * arch/risc-v/include/esp32c3/chip.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 __ARCH_RISCV_INCLUDE_ESPRESSIF_CHIP_H
-#define __ARCH_RISCV_INCLUDE_ESPRESSIF_CHIP_H
+#ifndef __ARCH_RISCV_INCLUDE_ESP32C3_CHIP_H
+#define __ARCH_RISCV_INCLUDE_ESP32C3_CHIP_H
/****************************************************************************
* Included Files
@@ -29,4 +29,4 @@
* Pre-processor Definitions
****************************************************************************/
-#endif /* __ARCH_RISCV_INCLUDE_ESPRESSIF_CHIP_H */
+#endif /* __ARCH_RISCV_INCLUDE_ESP32C3_CHIP_H */
diff --git a/arch/risc-v/include/espressif/.gitignore
b/arch/risc-v/include/esp32c6/.gitignore
similarity index 100%
copy from arch/risc-v/include/espressif/.gitignore
copy to arch/risc-v/include/esp32c6/.gitignore
diff --git a/arch/risc-v/include/espressif/chip.h
b/arch/risc-v/include/esp32c6/chip.h
similarity index 87%
copy from arch/risc-v/include/espressif/chip.h
copy to arch/risc-v/include/esp32c6/chip.h
index 58e4ba5435..12b241b8b7 100644
--- a/arch/risc-v/include/espressif/chip.h
+++ b/arch/risc-v/include/esp32c6/chip.h
@@ -1,5 +1,5 @@
/****************************************************************************
- * arch/risc-v/include/espressif/chip.h
+ * arch/risc-v/include/esp32c6/chip.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 __ARCH_RISCV_INCLUDE_ESPRESSIF_CHIP_H
-#define __ARCH_RISCV_INCLUDE_ESPRESSIF_CHIP_H
+#ifndef __ARCH_RISCV_INCLUDE_ESP32C6_CHIP_H
+#define __ARCH_RISCV_INCLUDE_ESP32C6_CHIP_H
/****************************************************************************
* Included Files
@@ -29,4 +29,4 @@
* Pre-processor Definitions
****************************************************************************/
-#endif /* __ARCH_RISCV_INCLUDE_ESPRESSIF_CHIP_H */
+#endif /* __ARCH_RISCV_INCLUDE_ESP32C6_CHIP_H */
diff --git a/arch/risc-v/include/espressif/.gitignore
b/arch/risc-v/include/esp32h2/.gitignore
similarity index 100%
rename from arch/risc-v/include/espressif/.gitignore
rename to arch/risc-v/include/esp32h2/.gitignore
diff --git a/arch/risc-v/include/espressif/chip.h
b/arch/risc-v/include/esp32h2/chip.h
similarity index 87%
rename from arch/risc-v/include/espressif/chip.h
rename to arch/risc-v/include/esp32h2/chip.h
index 58e4ba5435..64d4e2b27d 100644
--- a/arch/risc-v/include/espressif/chip.h
+++ b/arch/risc-v/include/esp32h2/chip.h
@@ -1,5 +1,5 @@
/****************************************************************************
- * arch/risc-v/include/espressif/chip.h
+ * arch/risc-v/include/esp32h2/chip.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 __ARCH_RISCV_INCLUDE_ESPRESSIF_CHIP_H
-#define __ARCH_RISCV_INCLUDE_ESPRESSIF_CHIP_H
+#ifndef __ARCH_RISCV_INCLUDE_ESP32H2_CHIP_H
+#define __ARCH_RISCV_INCLUDE_ESP32H2_CHIP_H
/****************************************************************************
* Included Files
@@ -29,4 +29,4 @@
* Pre-processor Definitions
****************************************************************************/
-#endif /* __ARCH_RISCV_INCLUDE_ESPRESSIF_CHIP_H */
+#endif /* __ARCH_RISCV_INCLUDE_ESP32H2_CHIP_H */
diff --git a/arch/risc-v/src/espressif/.gitignore
b/arch/risc-v/src/common/espressif/.gitignore
similarity index 100%
copy from arch/risc-v/src/espressif/.gitignore
copy to arch/risc-v/src/common/espressif/.gitignore
diff --git a/arch/risc-v/src/espressif/Kconfig
b/arch/risc-v/src/common/espressif/Kconfig
similarity index 89%
rename from arch/risc-v/src/espressif/Kconfig
rename to arch/risc-v/src/common/espressif/Kconfig
index e17b97382b..4edb6fae25 100644
--- a/arch/risc-v/src/espressif/Kconfig
+++ b/arch/risc-v/src/common/espressif/Kconfig
@@ -3,7 +3,7 @@
# see the file kconfig-language.txt in the NuttX tools repository.
#
-if ARCH_CHIP_ESPRESSIF
+if ARCH_CHIP_ESPRESSIF || ARCH_CHIP_ESP32C6 || ARCH_CHIP_ESP32H2 ||
ARCH_CHIP_ESP32C3_GENERIC
choice ESPRESSIF_CHIP_SERIES
prompt "Chip Series"
@@ -11,86 +11,16 @@ choice ESPRESSIF_CHIP_SERIES
config ESPRESSIF_ESP32C3
bool "ESP32-C3"
- select ARCH_RV32
- select ARCH_RV_ISA_M
- select ARCH_RV_ISA_C
- select ARCH_VECNOTIRQ
- select ARCH_HAVE_BOOTLOADER if !ESPRESSIF_SIMPLE_BOOT
- select ARCH_HAVE_MPU
- select ARCH_HAVE_RESET
- select ARCH_HAVE_RNG
- select ARCH_HAVE_TICKLESS
- select LIBC_ARCH_ATOMIC
- select LIBC_ARCH_MEMCPY
- select LIBC_ARCH_MEMCHR
- select LIBC_ARCH_MEMCMP
- select LIBC_ARCH_MEMMOVE
- select LIBC_ARCH_MEMSET
- select LIBC_ARCH_STRCHR
- select LIBC_ARCH_STRCMP
- select LIBC_ARCH_STRCPY
- select LIBC_ARCH_STRLCPY
- select LIBC_ARCH_STRNCPY
- select LIBC_ARCH_STRLEN
- select LIBC_ARCH_STRNLEN
- select ESPRESSIF_SOC_RTC_MEM_SUPPORTED
---help---
ESP32-C3 chip with a single RISC-V IMC core, no embedded Flash
memory
config ESPRESSIF_ESP32C6
bool "ESP32-C6"
- select ARCH_RV32
- select ARCH_RV_ISA_M
- select ARCH_RV_ISA_A
- select ARCH_RV_ISA_C
- select ARCH_VECNOTIRQ
- select ARCH_HAVE_BOOTLOADER
- select ARCH_HAVE_MPU
- select ARCH_HAVE_RESET
- select ARCH_HAVE_RNG
- select ARCH_HAVE_TICKLESS
- select LIBC_ARCH_MEMCPY
- select LIBC_ARCH_MEMCHR
- select LIBC_ARCH_MEMCMP
- select LIBC_ARCH_MEMMOVE
- select LIBC_ARCH_MEMSET
- select LIBC_ARCH_STRCHR
- select LIBC_ARCH_STRCMP
- select LIBC_ARCH_STRCPY
- select LIBC_ARCH_STRLCPY
- select LIBC_ARCH_STRNCPY
- select LIBC_ARCH_STRLEN
- select LIBC_ARCH_STRNLEN
- select ESPRESSIF_SOC_RTC_MEM_SUPPORTED
---help---
Espressif ESP32-C6 (RV32IMAC).
config ESPRESSIF_ESP32H2
bool "ESP32-H2"
- select ARCH_RV32
- select ARCH_RV_ISA_M
- select ARCH_RV_ISA_C
- select ARCH_VECNOTIRQ
- select ARCH_HAVE_BOOTLOADER
- select ARCH_HAVE_MPU
- select ARCH_HAVE_RESET
- select ARCH_HAVE_RNG
- select ARCH_HAVE_TICKLESS
- select LIBC_ARCH_ATOMIC
- select LIBC_ARCH_MEMCPY
- select LIBC_ARCH_MEMCHR
- select LIBC_ARCH_MEMCMP
- select LIBC_ARCH_MEMMOVE
- select LIBC_ARCH_MEMSET
- select LIBC_ARCH_STRCHR
- select LIBC_ARCH_STRCMP
- select LIBC_ARCH_STRCPY
- select LIBC_ARCH_STRLCPY
- select LIBC_ARCH_STRNCPY
- select LIBC_ARCH_STRLEN
- select LIBC_ARCH_STRNLEN
- select ESPRESSIF_ESPTOOLPY_NO_STUB
- select ESPRESSIF_SOC_RTC_MEM_SUPPORTED
---help---
Espressif ESP32-H2 (RV32IMC).
@@ -234,7 +164,7 @@ config ESPRESSIF_MCUBOOT_VERSION
depends on ESPRESSIF_BOOTLOADER_MCUBOOT
default "aa7e2b1faae623dbe01bbc6094e71ab44ec9d80a"
-choice
+choice ESPRESSIF_ESPTOOL_TARGET_SLOT
prompt "Target slot for image flashing"
default ESPRESSIF_ESPTOOL_TARGET_PRIMARY
depends on ESPRESSIF_HAVE_OTA_PARTITION
diff --git a/arch/risc-v/src/common/espressif/Make.defs
b/arch/risc-v/src/common/espressif/Make.defs
index 78e2e671ab..6e5d445c1b 100644
--- a/arch/risc-v/src/common/espressif/Make.defs
+++ b/arch/risc-v/src/common/espressif/Make.defs
@@ -73,7 +73,47 @@ ifeq ($(CONFIG_ESPRESSIF_USBSERIAL),y)
CHIP_CSRCS += esp_usbserial.c
endif
+#############################################################################
+# Espressif HAL for 3rd Party Platforms
+#############################################################################
+
+# Fetch source files and add them to build
+
+ESP_HAL_3RDPARTY_REPO = esp-hal-3rdparty
+ifndef ESP_HAL_3RDPARTY_VERSION
+ ESP_HAL_3RDPARTY_VERSION = b6a943764f5e5a12d12edd8a6d71bdecc505428c
+endif
+
+ifndef ESP_HAL_3RDPARTY_URL
+ ESP_HAL_3RDPARTY_URL =
https://github.com/espressif/esp-hal-3rdparty.git
+endif
+
+chip/$(ESP_HAL_3RDPARTY_REPO):
+ $(Q) echo "Cloning Espressif HAL for 3rd Party Platforms"
+ $(Q) git clone --quiet $(ESP_HAL_3RDPARTY_URL)
chip/$(ESP_HAL_3RDPARTY_REPO)
+ $(Q) echo "Espressif HAL for 3rd Party Platforms:
${ESP_HAL_3RDPARTY_VERSION}"
+ $(Q) git -C chip/$(ESP_HAL_3RDPARTY_REPO) checkout --quiet
$(ESP_HAL_3RDPARTY_VERSION)
+
include common$(DELIM)espressif$(DELIM)Bootloader.mk
+# Silent preprocessor warnings
+
+CFLAGS += -Wno-undef -Wno-unused-variable
+
+# Remove quotes from CONFIG_ESPRESSIF_CHIP_SERIES configuration
+
+CHIP_SERIES = $(patsubst "%",%,$(CONFIG_ESPRESSIF_CHIP_SERIES))
+
+include chip/hal_${CHIP_SERIES}.mk
+
+context:: chip/$(ESP_HAL_3RDPARTY_REPO)
+ $(call
COPYFILE,chip/$(ESP_HAL_3RDPARTY_REPO)/components/soc/$(CHIP_SERIES)/include/soc/gpio_sig_map.h,../include/chip/)
+ $(call
COPYFILE,chip/$(ESP_HAL_3RDPARTY_REPO)/nuttx/$(CHIP_SERIES)/include/irq.h,../include/chip/)
+
+distclean::
+ $(call DELFILE,../include/chip/gpio_sig_map.h)
+ $(call DELFILE,../include/chip/irq.h)
+ $(call DELDIR,chip/$(ESP_HAL_3RDPARTY_REPO))
+
INCLUDES += ${INCDIR_PREFIX}$(ARCH_SRCDIR)$(DELIM)common$(DELIM)espressif
VPATH += common$(DELIM)espressif
diff --git a/arch/risc-v/src/common/espressif/esp_vectors.S
b/arch/risc-v/src/common/espressif/esp_vectors.S
index 3fccb56abc..28d50a5843 100644
--- a/arch/risc-v/src/common/espressif/esp_vectors.S
+++ b/arch/risc-v/src/common/espressif/esp_vectors.S
@@ -24,7 +24,6 @@
#include <nuttx/config.h>
-#include <arch/espressif/irq.h>
#include <arch/irq.h>
#include "chip.h"
diff --git a/arch/risc-v/src/espressif/.gitignore
b/arch/risc-v/src/esp32c3/.gitignore
similarity index 100%
copy from arch/risc-v/src/espressif/.gitignore
copy to arch/risc-v/src/esp32c3/.gitignore
diff --git a/boards/risc-v/espressif/esp32c3-generic/Kconfig
b/arch/risc-v/src/esp32c3/Kconfig
similarity index 54%
copy from boards/risc-v/espressif/esp32c3-generic/Kconfig
copy to arch/risc-v/src/esp32c3/Kconfig
index 98f0ee2b5e..03dbd9ddf2 100644
--- a/boards/risc-v/espressif/esp32c3-generic/Kconfig
+++ b/arch/risc-v/src/esp32c3/Kconfig
@@ -3,6 +3,8 @@
# see the file kconfig-language.txt in the NuttX tools repository.
#
-if ARCH_BOARD_ESP32C3_GENERIC
+if ARCH_CHIP_ESP32C3_GENERIC
-endif # ARCH_BOARD_ESP32C3_GENERIC
+source "arch/risc-v/src/common/espressif/Kconfig"
+
+endif # ARCH_CHIP_ESP32C3_GENERIC
diff --git a/boards/risc-v/espressif/common/src/Make.defs
b/arch/risc-v/src/esp32c3/Make.defs
similarity index 73%
copy from boards/risc-v/espressif/common/src/Make.defs
copy to arch/risc-v/src/esp32c3/Make.defs
index fff6e89461..7a10e38f01 100644
--- a/boards/risc-v/espressif/common/src/Make.defs
+++ b/arch/risc-v/src/esp32c3/Make.defs
@@ -1,5 +1,5 @@
-#############################################################################
-# boards/risc-v/espressif/common/src/Make.defs
+############################################################################
+# arch/risc-v/src/esp32c3/Make.defs
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
@@ -16,16 +16,7 @@
# License for the specific language governing permissions and limitations
# under the License.
#
-#############################################################################
+############################################################################
-ifeq ($(CONFIG_ARCH_BOARD_COMMON),y)
-
-ifeq ($(CONFIG_ESPRESSIF_LEDC),y)
- CSRCS += esp_board_ledc.c
-endif
-
-DEPPATH += --dep-path src
-VPATH += :src
-CFLAGS +=
${INCDIR_PREFIX}$(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)src
-
-endif
+include common/Make.defs
+include common/espressif/Make.defs
diff --git a/arch/risc-v/src/espressif/hal_esp32c3.mk
b/arch/risc-v/src/esp32c3/hal_esp32c3.mk
similarity index 99%
rename from arch/risc-v/src/espressif/hal_esp32c3.mk
rename to arch/risc-v/src/esp32c3/hal_esp32c3.mk
index aaa774e1aa..e877c1a8fe 100644
--- a/arch/risc-v/src/espressif/hal_esp32c3.mk
+++ b/arch/risc-v/src/esp32c3/hal_esp32c3.mk
@@ -1,5 +1,5 @@
############################################################################
-# arch/risc-v/src/espressif/esp32c3.mk
+# arch/risc-v/src/esp32c3/esp32c3.mk
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
diff --git a/arch/risc-v/src/espressif/.gitignore
b/arch/risc-v/src/esp32c6/.gitignore
similarity index 100%
copy from arch/risc-v/src/espressif/.gitignore
copy to arch/risc-v/src/esp32c6/.gitignore
diff --git a/boards/risc-v/espressif/esp32c3-generic/Kconfig
b/arch/risc-v/src/esp32c6/Kconfig
similarity index 57%
copy from boards/risc-v/espressif/esp32c3-generic/Kconfig
copy to arch/risc-v/src/esp32c6/Kconfig
index 98f0ee2b5e..e83f7d3555 100644
--- a/boards/risc-v/espressif/esp32c3-generic/Kconfig
+++ b/arch/risc-v/src/esp32c6/Kconfig
@@ -3,6 +3,8 @@
# see the file kconfig-language.txt in the NuttX tools repository.
#
-if ARCH_BOARD_ESP32C3_GENERIC
+if ARCH_CHIP_ESP32C6
-endif # ARCH_BOARD_ESP32C3_GENERIC
+source "arch/risc-v/src/common/espressif/Kconfig"
+
+endif # ARCH_CHIP_ESP32C6
diff --git a/boards/risc-v/espressif/common/src/Make.defs
b/arch/risc-v/src/esp32c6/Make.defs
similarity index 73%
copy from boards/risc-v/espressif/common/src/Make.defs
copy to arch/risc-v/src/esp32c6/Make.defs
index fff6e89461..ccd4b90737 100644
--- a/boards/risc-v/espressif/common/src/Make.defs
+++ b/arch/risc-v/src/esp32c6/Make.defs
@@ -1,5 +1,5 @@
-#############################################################################
-# boards/risc-v/espressif/common/src/Make.defs
+############################################################################
+# arch/risc-v/src/esp32c6/Make.defs
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
@@ -16,16 +16,7 @@
# License for the specific language governing permissions and limitations
# under the License.
#
-#############################################################################
+############################################################################
-ifeq ($(CONFIG_ARCH_BOARD_COMMON),y)
-
-ifeq ($(CONFIG_ESPRESSIF_LEDC),y)
- CSRCS += esp_board_ledc.c
-endif
-
-DEPPATH += --dep-path src
-VPATH += :src
-CFLAGS +=
${INCDIR_PREFIX}$(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)src
-
-endif
+include common/Make.defs
+include common/espressif/Make.defs
diff --git a/arch/risc-v/src/espressif/hal_esp32c6.mk
b/arch/risc-v/src/esp32c6/hal_esp32c6.mk
similarity index 99%
rename from arch/risc-v/src/espressif/hal_esp32c6.mk
rename to arch/risc-v/src/esp32c6/hal_esp32c6.mk
index 2267222968..ffca8ab4f6 100644
--- a/arch/risc-v/src/espressif/hal_esp32c6.mk
+++ b/arch/risc-v/src/esp32c6/hal_esp32c6.mk
@@ -1,5 +1,5 @@
############################################################################
-# arch/risc-v/src/espressif/esp32c6.mk
+# arch/risc-v/src/esp32c6/esp32c6.mk
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
diff --git a/arch/risc-v/src/espressif/.gitignore
b/arch/risc-v/src/esp32h2/.gitignore
similarity index 100%
rename from arch/risc-v/src/espressif/.gitignore
rename to arch/risc-v/src/esp32h2/.gitignore
diff --git a/boards/risc-v/espressif/esp32c3-generic/Kconfig
b/arch/risc-v/src/esp32h2/Kconfig
similarity index 57%
copy from boards/risc-v/espressif/esp32c3-generic/Kconfig
copy to arch/risc-v/src/esp32h2/Kconfig
index 98f0ee2b5e..cd7f3510dd 100644
--- a/boards/risc-v/espressif/esp32c3-generic/Kconfig
+++ b/arch/risc-v/src/esp32h2/Kconfig
@@ -3,6 +3,8 @@
# see the file kconfig-language.txt in the NuttX tools repository.
#
-if ARCH_BOARD_ESP32C3_GENERIC
+if ARCH_CHIP_ESP32H2
-endif # ARCH_BOARD_ESP32C3_GENERIC
+source "arch/risc-v/src/common/espressif/Kconfig"
+
+endif # ARCH_CHIP_ESP32H2
diff --git a/boards/risc-v/espressif/common/src/Make.defs
b/arch/risc-v/src/esp32h2/Make.defs
similarity index 73%
copy from boards/risc-v/espressif/common/src/Make.defs
copy to arch/risc-v/src/esp32h2/Make.defs
index fff6e89461..0b77cc501d 100644
--- a/boards/risc-v/espressif/common/src/Make.defs
+++ b/arch/risc-v/src/esp32h2/Make.defs
@@ -1,5 +1,5 @@
-#############################################################################
-# boards/risc-v/espressif/common/src/Make.defs
+############################################################################
+# arch/risc-v/src/esp32h2/Make.defs
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
@@ -16,16 +16,7 @@
# License for the specific language governing permissions and limitations
# under the License.
#
-#############################################################################
+############################################################################
-ifeq ($(CONFIG_ARCH_BOARD_COMMON),y)
-
-ifeq ($(CONFIG_ESPRESSIF_LEDC),y)
- CSRCS += esp_board_ledc.c
-endif
-
-DEPPATH += --dep-path src
-VPATH += :src
-CFLAGS +=
${INCDIR_PREFIX}$(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)src
-
-endif
+include common/Make.defs
+include common/espressif/Make.defs
diff --git a/arch/risc-v/src/espressif/hal_esp32h2.mk
b/arch/risc-v/src/esp32h2/hal_esp32h2.mk
similarity index 99%
rename from arch/risc-v/src/espressif/hal_esp32h2.mk
rename to arch/risc-v/src/esp32h2/hal_esp32h2.mk
index c96f37719b..5c4edd8cac 100644
--- a/arch/risc-v/src/espressif/hal_esp32h2.mk
+++ b/arch/risc-v/src/esp32h2/hal_esp32h2.mk
@@ -1,5 +1,5 @@
############################################################################
-# arch/risc-v/src/espressif/esp32h2.mk
+# arch/risc-v/src/esp32c6/esp32h2.mk
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
diff --git a/arch/risc-v/src/espressif/Make.defs
b/arch/risc-v/src/espressif/Make.defs
deleted file mode 100644
index 3280ac82e6..0000000000
--- a/arch/risc-v/src/espressif/Make.defs
+++ /dev/null
@@ -1,62 +0,0 @@
-############################################################################
-# arch/risc-v/src/espressif/Make.defs
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership. The
-# ASF licenses this file to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance with the
-# License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
-#
-############################################################################
-
-include common/Make.defs
-include common/espressif/Make.defs
-
-#############################################################################
-# Espressif HAL for 3rd Party Platforms
-#############################################################################
-
-# Fetch source files and add them to build
-
-ESP_HAL_3RDPARTY_REPO = esp-hal-3rdparty
-ifndef ESP_HAL_3RDPARTY_VERSION
- ESP_HAL_3RDPARTY_VERSION = b6a943764f5e5a12d12edd8a6d71bdecc505428c
-endif
-
-ifndef ESP_HAL_3RDPARTY_URL
- ESP_HAL_3RDPARTY_URL =
https://github.com/espressif/esp-hal-3rdparty.git
-endif
-
-chip/$(ESP_HAL_3RDPARTY_REPO):
- $(Q) echo "Cloning Espressif HAL for 3rd Party Platforms"
- $(Q) git clone --quiet $(ESP_HAL_3RDPARTY_URL)
chip/$(ESP_HAL_3RDPARTY_REPO)
- $(Q) echo "Espressif HAL for 3rd Party Platforms:
${ESP_HAL_3RDPARTY_VERSION}"
- $(Q) git -C chip/$(ESP_HAL_3RDPARTY_REPO) checkout --quiet
$(ESP_HAL_3RDPARTY_VERSION)
-
-# Silent preprocessor warnings
-
-CFLAGS += -Wno-undef -Wno-unused-variable
-
-# Remove quotes from CONFIG_ESPRESSIF_CHIP_SERIES configuration
-
-CHIP_SERIES = $(patsubst "%",%,$(CONFIG_ESPRESSIF_CHIP_SERIES))
-
-include chip/hal_${CHIP_SERIES}.mk
-
-context:: chip/$(ESP_HAL_3RDPARTY_REPO)
- $(call
COPYFILE,chip/$(ESP_HAL_3RDPARTY_REPO)/components/soc/$(CHIP_SERIES)/include/soc/gpio_sig_map.h,../include/chip/)
- $(call
COPYFILE,chip/$(ESP_HAL_3RDPARTY_REPO)/nuttx/$(CHIP_SERIES)/include/irq.h,../include/chip/)
-
-distclean::
- $(call DELFILE,../include/chip/gpio_sig_map.h)
- $(call DELFILE,../include/chip/irq.h)
- $(call DELDIR,chip/$(ESP_HAL_3RDPARTY_REPO))
diff --git a/boards/Kconfig b/boards/Kconfig
index 0e2a808a77..5fed6ec4c0 100644
--- a/boards/Kconfig
+++ b/boards/Kconfig
@@ -487,7 +487,7 @@ 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_GENERIC
+config ARCH_BOARD_ESP32C6_DEVKIT
bool "Espressif ESP32-C6 Generic DevKit"
depends on ESPRESSIF_ESP32C6
select ARCH_HAVE_BUTTONS
@@ -495,7 +495,7 @@ config ARCH_BOARD_ESP32C6_GENERIC
---help---
The ESP32-C6 DevKit features the ESP32-C6 CPU with a RISC-V
core.
-config ARCH_BOARD_ESP32H2_GENERIC
+config ARCH_BOARD_ESP32H2_DEVKIT
bool "Espressif ESP32-H2 Generic DevKit"
depends on ESPRESSIF_ESP32H2
select ARCH_HAVE_BUTTONS
@@ -510,15 +510,6 @@ config ARCH_BOARD_ET_STM32_STAMP
The ET-STM32 Stamp features the STM32F103RET6 (Cortex M3)
microcontroller.
For board details, see:
https://www.futurlec.com/ET-STM32_Stamp.shtml
-config ARCH_BOARD_ESP32C6_DEVKIT
- bool "Espressif ESP32-C6 DevKit"
- depends on ARCH_CHIP_ESP32C6MINI1 || ARCH_CHIP_ESP32C6WROOM1
- ---help---
- The ESP32-C6 DevKit features the ESP32-C6 CPU with a RISC-V
core.
- It comes in two flavors, the ESP32-C6-DevKitM-1 and the
ESP32-C6-DevKitC-02.
- The ESP32-C6-DevKitM-1 version contains the ESP32-C6-MINI-1
module and the
- ESP32-C6-DevKitC-02 version the ESP32-C6-WROOM-1.
-
config ARCH_BOARD_EZ80F910200KITG
bool "ZiLOG ez80f910200kitg development kit"
depends on ARCH_CHIP_EZ80F91
@@ -3124,8 +3115,7 @@ config ARCH_BOARD
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-generic" if ARCH_BOARD_ESP32C6_GENERIC
- default "esp32h2-generic" if ARCH_BOARD_ESP32H2_GENERIC
+ default "esp32h2-devkit" if ARCH_BOARD_ESP32H2_DEVKIT
default "et-stm32-stamp" if ARCH_BOARD_ET_STM32_STAMP
default "tlsr8278adk80d" if ARCH_BOARD_TLSR8278ADK80D
default "ez80f910200kitg" if ARCH_BOARD_EZ80F910200KITG
@@ -4192,7 +4182,7 @@ if ARCH_BOARD_ESP32C3_DEVKIT_RUST1
source "boards/risc-v/esp32c3-legacy/esp32c3-devkit-rust-1/Kconfig"
endif
if ARCH_BOARD_ESP32C3_GENERIC
-source "boards/risc-v/espressif/esp32c3-generic/Kconfig"
+source "boards/risc-v/esp32c3/esp32c3-generic/Kconfig"
endif
if ARCH_BOARD_ESP32S2_KALUGA_1
source "boards/xtensa/esp32s2/esp32s2-kaluga-1/Kconfig"
@@ -4218,11 +4208,11 @@ endif
if ARCH_BOARD_ESP32S3_BOX
source "boards/xtensa/esp32s3/esp32s3-box/Kconfig"
endif
-if ARCH_BOARD_ESP32C6_GENERIC
-source "boards/risc-v/espressif/esp32c6-generic/Kconfig"
-endif
-if ARCH_BOARD_ESP32H2_GENERIC
-source "boards/risc-v/espressif/esp32h2-generic/Kconfig"
+#if ARCH_BOARD_ESP32C6_DEVKIT
+#source "boards/risc-v/esp32c6/esp32c6-devkit/Kconfig"
+#endif
+if ARCH_BOARD_ESP32H2_DEVKIT
+source "boards/risc-v/esp32h2/esp32h2-devkit/Kconfig"
endif
if ARCH_BOARD_SIM
source "boards/sim/sim/sim/Kconfig"
@@ -4354,8 +4344,14 @@ endif
if ARCH_CHIP_ESP32C3
source "boards/risc-v/esp32c3-legacy/common/Kconfig"
endif
-if ARCH_CHIP_ESPRESSIF
-source "boards/risc-v/espressif/common/Kconfig"
+if ARCH_CHIP_ESP32C3_GENERIC
+source "boards/risc-v/esp32c3/common/Kconfig"
+endif
+if ARCH_CHIP_ESP32C6
+source "boards/risc-v/esp32c6/common/Kconfig"
+endif
+if ARCH_CHIP_ESP32H2
+source "boards/risc-v/esp32h2/common/Kconfig"
endif
if ARCH_CHIP_SAMV7
source "boards/arm/samv7/common/Kconfig"
diff --git a/boards/risc-v/espressif/common/Kconfig
b/boards/risc-v/esp32c3/common/Kconfig
similarity index 100%
copy from boards/risc-v/espressif/common/Kconfig
copy to boards/risc-v/esp32c3/common/Kconfig
diff --git a/boards/risc-v/espressif/common/Makefile
b/boards/risc-v/esp32c3/common/Makefile
similarity index 96%
copy from boards/risc-v/espressif/common/Makefile
copy to boards/risc-v/esp32c3/common/Makefile
index 546b3a62b4..8ea9c30d28 100644
--- a/boards/risc-v/espressif/common/Makefile
+++ b/boards/risc-v/esp32c3/common/Makefile
@@ -1,5 +1,5 @@
#############################################################################
-# boards/risc-v/espressif/common/Makefile
+# boards/risc-v/esp32c3/common/Makefile
#
# 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/espressif/common/include/esp_board_ledc.h
b/boards/risc-v/esp32c3/common/include/esp_board_ledc.h
similarity index 89%
copy from boards/risc-v/espressif/common/include/esp_board_ledc.h
copy to boards/risc-v/esp32c3/common/include/esp_board_ledc.h
index df6bc291a0..06eeedd0ea 100644
--- a/boards/risc-v/espressif/common/include/esp_board_ledc.h
+++ b/boards/risc-v/esp32c3/common/include/esp_board_ledc.h
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/risc-v/espressif/common/include/esp_board_ledc.h
+ * boards/risc-v/esp32c3/common/include/esp_board_ledc.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_ESPRESSIF_COMMON_INCLUDE_ESP_BOARD_LEDC_H
-#define __BOARDS_RISCV_ESPRESSIF_COMMON_INCLUDE_ESP_BOARD_LEDC_H
+#ifndef __BOARDS_RISCV_ESP32C3_COMMON_INCLUDE_ESP_BOARD_LEDC_H
+#define __BOARDS_RISCV_ESP32C3_COMMON_INCLUDE_ESP_BOARD_LEDC_H
/****************************************************************************
* Included Files
@@ -71,4 +71,4 @@ int board_ledc_setup(void);
#endif
#endif /* __ASSEMBLY__ */
-#endif /* __BOARDS_RISCV_ESPRESSIF_COMMON_INCLUDE_ESP_BOARD_LEDC_H */
+#endif /* __BOARDS_RISCV_ESP32C3_COMMON_INCLUDE_ESP_BOARD_LEDC_H */
diff --git a/boards/risc-v/espressif/common/scripts/.gitignore
b/boards/risc-v/esp32c3/common/scripts/.gitignore
similarity index 100%
copy from boards/risc-v/espressif/common/scripts/.gitignore
copy to boards/risc-v/esp32c3/common/scripts/.gitignore
diff --git a/boards/risc-v/espressif/common/scripts/common.ld
b/boards/risc-v/esp32c3/common/scripts/common.ld
similarity index 96%
copy from boards/risc-v/espressif/common/scripts/common.ld
copy to boards/risc-v/esp32c3/common/scripts/common.ld
index 2f93e1b795..7b2292738b 100644
--- a/boards/risc-v/espressif/common/scripts/common.ld
+++ b/boards/risc-v/esp32c3/common/scripts/common.ld
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/risc-v/espressif/common/scripts/common.ld
+ * boards/risc-v/esp32c3/common/scripts/common.ld
*
* 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/espressif/common/scripts/esp32c3_aliases.ld
b/boards/risc-v/esp32c3/common/scripts/esp32c3_aliases.ld
similarity index 96%
rename from boards/risc-v/espressif/common/scripts/esp32c3_aliases.ld
rename to boards/risc-v/esp32c3/common/scripts/esp32c3_aliases.ld
index b9d9d90c67..3a071e54f1 100644
--- a/boards/risc-v/espressif/common/scripts/esp32c3_aliases.ld
+++ b/boards/risc-v/esp32c3/common/scripts/esp32c3_aliases.ld
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/risc-v/espressif/common/scripts/esp32c3_aliases.ld
+ * boards/risc-v/esp32c3/common/scripts/esp32c3_aliases.ld
*
* 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/espressif/common/scripts/esp32c3_flat_memory.ld
b/boards/risc-v/esp32c3/common/scripts/esp32c3_flat_memory.ld
similarity index 99%
rename from boards/risc-v/espressif/common/scripts/esp32c3_flat_memory.ld
rename to boards/risc-v/esp32c3/common/scripts/esp32c3_flat_memory.ld
index 6df79d39cb..1b33b193c9 100644
--- a/boards/risc-v/espressif/common/scripts/esp32c3_flat_memory.ld
+++ b/boards/risc-v/esp32c3/common/scripts/esp32c3_flat_memory.ld
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/risc-v/espressif/common/scripts/esp32c3_flat_memory.ld
+ * boards/risc-v/esp32c3/common/scripts/esp32c3_flat_memory.ld
*
* 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/espressif/common/scripts/esp32c3_legacy_sections.ld
b/boards/risc-v/esp32c3/common/scripts/esp32c3_legacy_sections.ld
similarity index 99%
rename from boards/risc-v/espressif/common/scripts/esp32c3_legacy_sections.ld
rename to boards/risc-v/esp32c3/common/scripts/esp32c3_legacy_sections.ld
index 75694ba589..ea10de821d 100644
--- a/boards/risc-v/espressif/common/scripts/esp32c3_legacy_sections.ld
+++ b/boards/risc-v/esp32c3/common/scripts/esp32c3_legacy_sections.ld
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/risc-v/espressif/common/scripts/esp32c3_legacy_sections.ld
+ * boards/risc-v/esp32c3/common/scripts/esp32c3_legacy_sections.ld
*
* 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/espressif/common/scripts/esp32c3_mcuboot_sections.ld
b/boards/risc-v/esp32c3/common/scripts/esp32c3_mcuboot_sections.ld
similarity index 99%
rename from boards/risc-v/espressif/common/scripts/esp32c3_mcuboot_sections.ld
rename to boards/risc-v/esp32c3/common/scripts/esp32c3_mcuboot_sections.ld
index bce770697d..d5a1527537 100644
--- a/boards/risc-v/espressif/common/scripts/esp32c3_mcuboot_sections.ld
+++ b/boards/risc-v/esp32c3/common/scripts/esp32c3_mcuboot_sections.ld
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/risc-v/espressif/common/scripts/esp32c3_mcuboot_sections.ld
+ * boards/risc-v/esp32c3/common/scripts/esp32c3_mcuboot_sections.ld
*
* 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/espressif/common/scripts/esp32c3_simple_boot_sections.ld
b/boards/risc-v/esp32c3/common/scripts/esp32c3_simple_boot_sections.ld
similarity index 99%
rename from
boards/risc-v/espressif/common/scripts/esp32c3_simple_boot_sections.ld
rename to boards/risc-v/esp32c3/common/scripts/esp32c3_simple_boot_sections.ld
index b1db1cb4cb..c9266e26a3 100644
--- a/boards/risc-v/espressif/common/scripts/esp32c3_simple_boot_sections.ld
+++ b/boards/risc-v/esp32c3/common/scripts/esp32c3_simple_boot_sections.ld
@@ -396,4 +396,3 @@ SECTIONS
"RTC reserved segment data does not fit.")
}
-
diff --git a/boards/risc-v/espressif/common/src/Make.defs
b/boards/risc-v/esp32c3/common/src/Make.defs
similarity index 96%
copy from boards/risc-v/espressif/common/src/Make.defs
copy to boards/risc-v/esp32c3/common/src/Make.defs
index fff6e89461..0c1d6abbb2 100644
--- a/boards/risc-v/espressif/common/src/Make.defs
+++ b/boards/risc-v/esp32c3/common/src/Make.defs
@@ -1,5 +1,5 @@
#############################################################################
-# boards/risc-v/espressif/common/src/Make.defs
+# boards/risc-v/esp32c3/common/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/espressif/common/src/esp_board_ledc.c
b/boards/risc-v/esp32c3/common/src/esp_board_ledc.c
similarity index 98%
copy from boards/risc-v/espressif/common/src/esp_board_ledc.c
copy to boards/risc-v/esp32c3/common/src/esp_board_ledc.c
index 5ed796c5cf..907ac16608 100644
--- a/boards/risc-v/espressif/common/src/esp_board_ledc.c
+++ b/boards/risc-v/esp32c3/common/src/esp_board_ledc.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/risc-v/espressif/common/src/esp_board_ledc.c
+ * boards/risc-v/esp32c3/common/src/esp_board_ledc.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/espressif/esp32c3-generic/Kconfig
b/boards/risc-v/esp32c3/esp32c3-generic/Kconfig
similarity index 100%
rename from boards/risc-v/espressif/esp32c3-generic/Kconfig
rename to boards/risc-v/esp32c3/esp32c3-generic/Kconfig
diff --git a/boards/risc-v/espressif/esp32c3-generic/configs/buttons/defconfig
b/boards/risc-v/esp32c3/esp32c3-generic/configs/buttons/defconfig
similarity index 95%
rename from boards/risc-v/espressif/esp32c3-generic/configs/buttons/defconfig
rename to boards/risc-v/esp32c3/esp32c3-generic/configs/buttons/defconfig
index 1c3fe6d497..f2cfa6af70 100644
--- a/boards/risc-v/espressif/esp32c3-generic/configs/buttons/defconfig
+++ b/boards/risc-v/esp32c3/esp32c3-generic/configs/buttons/defconfig
@@ -12,8 +12,8 @@ CONFIG_ARCH_BOARD="esp32c3-generic"
CONFIG_ARCH_BOARD_COMMON=y
CONFIG_ARCH_BOARD_ESP32C3_GENERIC=y
CONFIG_ARCH_BUTTONS=y
-CONFIG_ARCH_CHIP="espressif"
-CONFIG_ARCH_CHIP_ESPRESSIF=y
+CONFIG_ARCH_CHIP="esp32c3"
+CONFIG_ARCH_CHIP_ESP32C3_GENERIC=y
CONFIG_ARCH_INTERRUPTSTACK=1536
CONFIG_ARCH_IRQBUTTONS=y
CONFIG_ARCH_RISCV=y
diff --git a/boards/risc-v/espressif/esp32c3-generic/configs/gpio/defconfig
b/boards/risc-v/esp32c3/esp32c3-generic/configs/gpio/defconfig
similarity index 95%
rename from boards/risc-v/espressif/esp32c3-generic/configs/gpio/defconfig
rename to boards/risc-v/esp32c3/esp32c3-generic/configs/gpio/defconfig
index f76919c44a..247f6389cb 100644
--- a/boards/risc-v/espressif/esp32c3-generic/configs/gpio/defconfig
+++ b/boards/risc-v/esp32c3/esp32c3-generic/configs/gpio/defconfig
@@ -11,8 +11,8 @@ CONFIG_ARCH="risc-v"
CONFIG_ARCH_BOARD="esp32c3-generic"
CONFIG_ARCH_BOARD_COMMON=y
CONFIG_ARCH_BOARD_ESP32C3_GENERIC=y
-CONFIG_ARCH_CHIP="espressif"
-CONFIG_ARCH_CHIP_ESPRESSIF=y
+CONFIG_ARCH_CHIP="esp32c3"
+CONFIG_ARCH_CHIP_ESP32C3_GENERIC=y
CONFIG_ARCH_INTERRUPTSTACK=1536
CONFIG_ARCH_RISCV=y
CONFIG_ARCH_STACKDUMP=y
diff --git
a/boards/risc-v/espressif/esp32c3-generic/configs/mcuboot_nsh/defconfig
b/boards/risc-v/esp32c3/esp32c3-generic/configs/mcuboot_nsh/defconfig
similarity index 95%
rename from
boards/risc-v/espressif/esp32c3-generic/configs/mcuboot_nsh/defconfig
rename to boards/risc-v/esp32c3/esp32c3-generic/configs/mcuboot_nsh/defconfig
index e9e52805b1..5965c38343 100644
--- a/boards/risc-v/espressif/esp32c3-generic/configs/mcuboot_nsh/defconfig
+++ b/boards/risc-v/esp32c3/esp32c3-generic/configs/mcuboot_nsh/defconfig
@@ -11,8 +11,8 @@ CONFIG_ARCH="risc-v"
CONFIG_ARCH_BOARD="esp32c3-generic"
CONFIG_ARCH_BOARD_COMMON=y
CONFIG_ARCH_BOARD_ESP32C3_GENERIC=y
-CONFIG_ARCH_CHIP="espressif"
-CONFIG_ARCH_CHIP_ESPRESSIF=y
+CONFIG_ARCH_CHIP="esp32c3"
+CONFIG_ARCH_CHIP_ESP32C3_GENERIC=y
CONFIG_ARCH_INTERRUPTSTACK=1536
CONFIG_ARCH_RISCV=y
CONFIG_ARCH_STACKDUMP=y
diff --git a/boards/risc-v/espressif/esp32c3-generic/configs/nsh/defconfig
b/boards/risc-v/esp32c3/esp32c3-generic/configs/nsh/defconfig
similarity index 95%
rename from boards/risc-v/espressif/esp32c3-generic/configs/nsh/defconfig
rename to boards/risc-v/esp32c3/esp32c3-generic/configs/nsh/defconfig
index e5ae74000f..0eb6297651 100644
--- a/boards/risc-v/espressif/esp32c3-generic/configs/nsh/defconfig
+++ b/boards/risc-v/esp32c3/esp32c3-generic/configs/nsh/defconfig
@@ -11,8 +11,8 @@ CONFIG_ARCH="risc-v"
CONFIG_ARCH_BOARD="esp32c3-generic"
CONFIG_ARCH_BOARD_COMMON=y
CONFIG_ARCH_BOARD_ESP32C3_GENERIC=y
-CONFIG_ARCH_CHIP="espressif"
-CONFIG_ARCH_CHIP_ESPRESSIF=y
+CONFIG_ARCH_CHIP="esp32c3"
+CONFIG_ARCH_CHIP_ESP32C3_GENERIC=y
CONFIG_ARCH_INTERRUPTSTACK=1536
CONFIG_ARCH_RISCV=y
CONFIG_ARCH_STACKDUMP=y
diff --git a/boards/risc-v/espressif/esp32c3-generic/configs/pwm/defconfig
b/boards/risc-v/esp32c3/esp32c3-generic/configs/pwm/defconfig
similarity index 95%
rename from boards/risc-v/espressif/esp32c3-generic/configs/pwm/defconfig
rename to boards/risc-v/esp32c3/esp32c3-generic/configs/pwm/defconfig
index 382635d7d1..b284e6dd87 100644
--- a/boards/risc-v/espressif/esp32c3-generic/configs/pwm/defconfig
+++ b/boards/risc-v/esp32c3/esp32c3-generic/configs/pwm/defconfig
@@ -11,8 +11,8 @@ CONFIG_ARCH="risc-v"
CONFIG_ARCH_BOARD="esp32c3-generic"
CONFIG_ARCH_BOARD_COMMON=y
CONFIG_ARCH_BOARD_ESP32C3_GENERIC=y
-CONFIG_ARCH_CHIP="espressif"
-CONFIG_ARCH_CHIP_ESPRESSIF=y
+CONFIG_ARCH_CHIP="esp32c3"
+CONFIG_ARCH_CHIP_ESP32C3_GENERIC=y
CONFIG_ARCH_INTERRUPTSTACK=1536
CONFIG_ARCH_RISCV=y
CONFIG_ARCH_STACKDUMP=y
diff --git a/boards/risc-v/espressif/esp32c3-generic/configs/random/defconfig
b/boards/risc-v/esp32c3/esp32c3-generic/configs/random/defconfig
similarity index 95%
rename from boards/risc-v/espressif/esp32c3-generic/configs/random/defconfig
rename to boards/risc-v/esp32c3/esp32c3-generic/configs/random/defconfig
index 6e7aa75dbd..8aab7a02bf 100644
--- a/boards/risc-v/espressif/esp32c3-generic/configs/random/defconfig
+++ b/boards/risc-v/esp32c3/esp32c3-generic/configs/random/defconfig
@@ -11,8 +11,8 @@ CONFIG_ARCH="risc-v"
CONFIG_ARCH_BOARD="esp32c3-generic"
CONFIG_ARCH_BOARD_COMMON=y
CONFIG_ARCH_BOARD_ESP32C3_GENERIC=y
-CONFIG_ARCH_CHIP="espressif"
-CONFIG_ARCH_CHIP_ESPRESSIF=y
+CONFIG_ARCH_CHIP="esp32c3"
+CONFIG_ARCH_CHIP_ESP32C3_GENERIC=y
CONFIG_ARCH_INTERRUPTSTACK=2048
CONFIG_ARCH_RISCV=y
CONFIG_ARCH_STACKDUMP=y
diff --git a/boards/risc-v/espressif/esp32c3-generic/configs/rtc/defconfig
b/boards/risc-v/esp32c3/esp32c3-generic/configs/rtc/defconfig
similarity index 95%
rename from boards/risc-v/espressif/esp32c3-generic/configs/rtc/defconfig
rename to boards/risc-v/esp32c3/esp32c3-generic/configs/rtc/defconfig
index dfed670b9d..819aaf3c82 100644
--- a/boards/risc-v/espressif/esp32c3-generic/configs/rtc/defconfig
+++ b/boards/risc-v/esp32c3/esp32c3-generic/configs/rtc/defconfig
@@ -11,8 +11,8 @@ CONFIG_ARCH="risc-v"
CONFIG_ARCH_BOARD="esp32c3-generic"
CONFIG_ARCH_BOARD_COMMON=y
CONFIG_ARCH_BOARD_ESP32C3_GENERIC=y
-CONFIG_ARCH_CHIP="espressif"
-CONFIG_ARCH_CHIP_ESPRESSIF=y
+CONFIG_ARCH_CHIP="esp32c3"
+CONFIG_ARCH_CHIP_ESP32C3_GENERIC=y
CONFIG_ARCH_INTERRUPTSTACK=1536
CONFIG_ARCH_RISCV=y
CONFIG_ARCH_STACKDUMP=y
diff --git a/boards/risc-v/espressif/esp32c3-generic/configs/tickless/defconfig
b/boards/risc-v/esp32c3/esp32c3-generic/configs/tickless/defconfig
similarity index 95%
rename from boards/risc-v/espressif/esp32c3-generic/configs/tickless/defconfig
rename to boards/risc-v/esp32c3/esp32c3-generic/configs/tickless/defconfig
index 4ccae30888..96acf24e7c 100644
--- a/boards/risc-v/espressif/esp32c3-generic/configs/tickless/defconfig
+++ b/boards/risc-v/esp32c3/esp32c3-generic/configs/tickless/defconfig
@@ -11,8 +11,8 @@ CONFIG_ARCH="risc-v"
CONFIG_ARCH_BOARD="esp32c3-generic"
CONFIG_ARCH_BOARD_COMMON=y
CONFIG_ARCH_BOARD_ESP32C3_GENERIC=y
-CONFIG_ARCH_CHIP="espressif"
-CONFIG_ARCH_CHIP_ESPRESSIF=y
+CONFIG_ARCH_CHIP="esp32c3"
+CONFIG_ARCH_CHIP_ESP32C3_GENERIC=y
CONFIG_ARCH_INTERRUPTSTACK=1536
CONFIG_ARCH_RISCV=y
CONFIG_ARCH_STACKDUMP=y
diff --git a/boards/risc-v/espressif/esp32c3-generic/configs/timers/defconfig
b/boards/risc-v/esp32c3/esp32c3-generic/configs/timers/defconfig
similarity index 95%
rename from boards/risc-v/espressif/esp32c3-generic/configs/timers/defconfig
rename to boards/risc-v/esp32c3/esp32c3-generic/configs/timers/defconfig
index 221498a024..f17e504a73 100644
--- a/boards/risc-v/espressif/esp32c3-generic/configs/timers/defconfig
+++ b/boards/risc-v/esp32c3/esp32c3-generic/configs/timers/defconfig
@@ -11,8 +11,8 @@ CONFIG_ARCH="risc-v"
CONFIG_ARCH_BOARD="esp32c3-generic"
CONFIG_ARCH_BOARD_COMMON=y
CONFIG_ARCH_BOARD_ESP32C3_GENERIC=y
-CONFIG_ARCH_CHIP="espressif"
-CONFIG_ARCH_CHIP_ESPRESSIF=y
+CONFIG_ARCH_CHIP="esp32c3"
+CONFIG_ARCH_CHIP_ESP32C3_GENERIC=y
CONFIG_ARCH_INTERRUPTSTACK=1536
CONFIG_ARCH_RISCV=y
CONFIG_ARCH_STACKDUMP=y
diff --git
a/boards/risc-v/espressif/esp32c3-generic/configs/usbconsole/defconfig
b/boards/risc-v/esp32c3/esp32c3-generic/configs/usbconsole/defconfig
similarity index 95%
rename from boards/risc-v/espressif/esp32c3-generic/configs/usbconsole/defconfig
rename to boards/risc-v/esp32c3/esp32c3-generic/configs/usbconsole/defconfig
index 6a58081690..abb43ab4fb 100644
--- a/boards/risc-v/espressif/esp32c3-generic/configs/usbconsole/defconfig
+++ b/boards/risc-v/esp32c3/esp32c3-generic/configs/usbconsole/defconfig
@@ -12,8 +12,8 @@ CONFIG_ARCH="risc-v"
CONFIG_ARCH_BOARD="esp32c3-generic"
CONFIG_ARCH_BOARD_COMMON=y
CONFIG_ARCH_BOARD_ESP32C3_GENERIC=y
-CONFIG_ARCH_CHIP="espressif"
-CONFIG_ARCH_CHIP_ESPRESSIF=y
+CONFIG_ARCH_CHIP="esp32c3"
+CONFIG_ARCH_CHIP_ESP32C3_GENERIC=y
CONFIG_ARCH_INTERRUPTSTACK=1536
CONFIG_ARCH_RISCV=y
CONFIG_ARCH_STACKDUMP=y
diff --git a/boards/risc-v/espressif/esp32c3-generic/configs/watchdog/defconfig
b/boards/risc-v/esp32c3/esp32c3-generic/configs/watchdog/defconfig
similarity index 95%
rename from boards/risc-v/espressif/esp32c3-generic/configs/watchdog/defconfig
rename to boards/risc-v/esp32c3/esp32c3-generic/configs/watchdog/defconfig
index b6982e9923..73e0b126fd 100644
--- a/boards/risc-v/espressif/esp32c3-generic/configs/watchdog/defconfig
+++ b/boards/risc-v/esp32c3/esp32c3-generic/configs/watchdog/defconfig
@@ -11,8 +11,8 @@ CONFIG_ARCH="risc-v"
CONFIG_ARCH_BOARD="esp32c3-generic"
CONFIG_ARCH_BOARD_COMMON=y
CONFIG_ARCH_BOARD_ESP32C3_GENERIC=y
-CONFIG_ARCH_CHIP="espressif"
-CONFIG_ARCH_CHIP_ESPRESSIF=y
+CONFIG_ARCH_CHIP="esp32c3"
+CONFIG_ARCH_CHIP_ESP32C3_GENERIC=y
CONFIG_ARCH_INTERRUPTSTACK=1536
CONFIG_ARCH_RISCV=y
CONFIG_ARCH_STACKDUMP=y
diff --git a/boards/risc-v/espressif/esp32c3-generic/include/board.h
b/boards/risc-v/esp32c3/esp32c3-generic/include/board.h
similarity index 84%
rename from boards/risc-v/espressif/esp32c3-generic/include/board.h
rename to boards/risc-v/esp32c3/esp32c3-generic/include/board.h
index 2d2b63f799..a2adecb9ab 100644
--- a/boards/risc-v/espressif/esp32c3-generic/include/board.h
+++ b/boards/risc-v/esp32c3/esp32c3-generic/include/board.h
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/risc-v/espressif/esp32c3-generic/include/board.h
+ * boards/risc-v/esp32c3/esp32c3-generic/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_ESPRESSIF_ESP32C3_GENERIC_INCLUDE_BOARD_H
-#define __BOARDS_RISCV_ESPRESSIF_ESP32C3_GENERIC_INCLUDE_BOARD_H
+#ifndef __BOARDS_RISCV_ESP32C3_ESP32C3_GENERIC_INCLUDE_BOARD_H
+#define __BOARDS_RISCV_ESP32C3_ESP32C3_GENERIC_INCLUDE_BOARD_H
/****************************************************************************
* Pre-processor Definitions
@@ -36,5 +36,5 @@
#define BUTTON_BOOT 9
-#endif /* __BOARDS_RISCV_ESPRESSIF_ESP32C3_GENERIC_INCLUDE_BOARD_H */
+#endif /* __BOARDS_RISCV_ESP32C3_ESP32C3_GENERIC_INCLUDE_BOARD_H */
diff --git a/boards/risc-v/espressif/esp32c3-generic/scripts/Make.defs
b/boards/risc-v/esp32c3/esp32c3-generic/scripts/Make.defs
similarity index 97%
rename from boards/risc-v/espressif/esp32c3-generic/scripts/Make.defs
rename to boards/risc-v/esp32c3/esp32c3-generic/scripts/Make.defs
index ffd7e0220d..28f81bf61a 100644
--- a/boards/risc-v/espressif/esp32c3-generic/scripts/Make.defs
+++ b/boards/risc-v/esp32c3/esp32c3-generic/scripts/Make.defs
@@ -1,5 +1,5 @@
############################################################################
-# boards/risc-v/espressif/esp32c3-generic/scripts/Make.defs
+# boards/risc-v/esp32c3/esp32c3-generic/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/espressif/esp32c3-generic/src/Make.defs
b/boards/risc-v/esp32c3/esp32c3-generic/src/Make.defs
similarity index 96%
rename from boards/risc-v/espressif/esp32c3-generic/src/Make.defs
rename to boards/risc-v/esp32c3/esp32c3-generic/src/Make.defs
index 13618fe080..b23cab8ea0 100644
--- a/boards/risc-v/espressif/esp32c3-generic/src/Make.defs
+++ b/boards/risc-v/esp32c3/esp32c3-generic/src/Make.defs
@@ -1,5 +1,5 @@
#############################################################################
-# boards/risc-v/espressif/esp32c3-generic/src/Make.defs
+# boards/risc-v/esp32c3/esp32c3-generic/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/espressif/esp32c3-generic/src/esp32c3-generic.h
b/boards/risc-v/esp32c3/esp32c3-generic/src/esp32c3-generic.h
similarity index 91%
rename from boards/risc-v/espressif/esp32c3-generic/src/esp32c3-generic.h
rename to boards/risc-v/esp32c3/esp32c3-generic/src/esp32c3-generic.h
index 5ad4c459d5..97f82fe1d9 100644
--- a/boards/risc-v/espressif/esp32c3-generic/src/esp32c3-generic.h
+++ b/boards/risc-v/esp32c3/esp32c3-generic/src/esp32c3-generic.h
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/risc-v/espressif/esp32c3-generic/src/esp32c3-generic.h
+ * boards/risc-v/esp32c3/esp32c3-generic/src/esp32c3-generic.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_ESPRESSIF_ESP32C3_GENERIC_SRC_ESP32C3_GENERIC_H
-#define __BOARDS_RISCV_ESPRESSIF_ESP32C3_GENERIC_SRC_ESP32C3_GENERIC_H
+#ifndef __BOARDS_RISCV_ESP32C3_ESP32C3_GENERIC_SRC_ESP32C3_GENERIC_H
+#define __BOARDS_RISCV_ESP32C3_ESP32C3_GENERIC_SRC_ESP32C3_GENERIC_H
/****************************************************************************
* Included Files
@@ -84,4 +84,4 @@ int esp_gpio_init(void);
#endif
#endif /* __ASSEMBLY__ */
-#endif /* __BOARDS_RISCV_ESPRESSIF_ESP32C3_GENERIC_SRC_ESP32C3_GENERIC_H */
+#endif /* __BOARDS_RISCV_ESP32C3_ESP32C3_GENERIC_SRC_ESP32C3_GENERIC_H */
diff --git a/boards/risc-v/espressif/esp32c3-generic/src/esp32c3_appinit.c
b/boards/risc-v/esp32c3/esp32c3-generic/src/esp32c3_appinit.c
similarity index 97%
rename from boards/risc-v/espressif/esp32c3-generic/src/esp32c3_appinit.c
rename to boards/risc-v/esp32c3/esp32c3-generic/src/esp32c3_appinit.c
index c79226c3b1..431387e8c6 100644
--- a/boards/risc-v/espressif/esp32c3-generic/src/esp32c3_appinit.c
+++ b/boards/risc-v/esp32c3/esp32c3-generic/src/esp32c3_appinit.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/risc-v/espressif/esp32c3-generic/src/esp32c3_appinit.c
+ * boards/risc-v/esp32c3/esp32c3-generic/src/esp32c3_appinit.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/espressif/esp32c3-generic/src/esp32c3_boot.c
b/boards/risc-v/esp32c3/esp32c3-generic/src/esp32c3_boot.c
similarity index 98%
rename from boards/risc-v/espressif/esp32c3-generic/src/esp32c3_boot.c
rename to boards/risc-v/esp32c3/esp32c3-generic/src/esp32c3_boot.c
index 771f211aac..c133d101a3 100644
--- a/boards/risc-v/espressif/esp32c3-generic/src/esp32c3_boot.c
+++ b/boards/risc-v/esp32c3/esp32c3-generic/src/esp32c3_boot.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/risc-v/espressif/esp32c3-generic/src/esp32c3_boot.c
+ * boards/risc-v/esp32c3/esp32c3-generic/src/esp32c3_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/espressif/esp32c3-generic/src/esp32c3_bringup.c
b/boards/risc-v/esp32c3/esp32c3-generic/src/esp32c3_bringup.c
similarity index 98%
rename from boards/risc-v/espressif/esp32c3-generic/src/esp32c3_bringup.c
rename to boards/risc-v/esp32c3/esp32c3-generic/src/esp32c3_bringup.c
index 2f34f00c18..8ca8660f9f 100644
--- a/boards/risc-v/espressif/esp32c3-generic/src/esp32c3_bringup.c
+++ b/boards/risc-v/esp32c3/esp32c3-generic/src/esp32c3_bringup.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/risc-v/espressif/esp32c3-generic/src/esp32c3_bringup.c
+ * boards/risc-v/esp32c3/esp32c3-generic/src/esp32c3_bringup.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/espressif/esp32c3-generic/src/esp32c3_buttons.c
b/boards/risc-v/esp32c3/esp32c3-generic/src/esp32c3_buttons.c
similarity index 98%
rename from boards/risc-v/espressif/esp32c3-generic/src/esp32c3_buttons.c
rename to boards/risc-v/esp32c3/esp32c3-generic/src/esp32c3_buttons.c
index 9cbaffd15f..71f07e7dd8 100644
--- a/boards/risc-v/espressif/esp32c3-generic/src/esp32c3_buttons.c
+++ b/boards/risc-v/esp32c3/esp32c3-generic/src/esp32c3_buttons.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/risc-v/espressif/esp32c3-generic/src/esp32c3_buttons.c
+ * boards/risc-v/esp32c3/esp32c3-generic/src/esp32c3_buttons.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/espressif/esp32c3-generic/src/esp32c3_gpio.c
b/boards/risc-v/esp32c3/esp32c3-generic/src/esp32c3_gpio.c
similarity index 99%
rename from boards/risc-v/espressif/esp32c3-generic/src/esp32c3_gpio.c
rename to boards/risc-v/esp32c3/esp32c3-generic/src/esp32c3_gpio.c
index 73202832c7..f828b859db 100644
--- a/boards/risc-v/espressif/esp32c3-generic/src/esp32c3_gpio.c
+++ b/boards/risc-v/esp32c3/esp32c3-generic/src/esp32c3_gpio.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/risc-v/espressif/esp32c3-generic/src/esp32c3_gpio.c
+ * boards/risc-v/esp32c3/esp32c3-generic/src/esp32c3_gpio.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/espressif/esp32c3-generic/src/esp32c3_reset.c
b/boards/risc-v/esp32c3/esp32c3-generic/src/esp32c3_reset.c
similarity index 97%
rename from boards/risc-v/espressif/esp32c3-generic/src/esp32c3_reset.c
rename to boards/risc-v/esp32c3/esp32c3-generic/src/esp32c3_reset.c
index 6b51350e5c..5d5981518a 100644
--- a/boards/risc-v/espressif/esp32c3-generic/src/esp32c3_reset.c
+++ b/boards/risc-v/esp32c3/esp32c3-generic/src/esp32c3_reset.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/risc-v/espressif/esp32c3-generic/src/esp32c3_reset.c
+ * boards/risc-v/esp32c3/esp32c3-generic/src/esp32c3_reset.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/espressif/common/Kconfig
b/boards/risc-v/esp32c6/common/Kconfig
similarity index 100%
copy from boards/risc-v/espressif/common/Kconfig
copy to boards/risc-v/esp32c6/common/Kconfig
diff --git a/boards/risc-v/espressif/common/Makefile
b/boards/risc-v/esp32c6/common/Makefile
similarity index 96%
copy from boards/risc-v/espressif/common/Makefile
copy to boards/risc-v/esp32c6/common/Makefile
index 546b3a62b4..f6fc6ec001 100644
--- a/boards/risc-v/espressif/common/Makefile
+++ b/boards/risc-v/esp32c6/common/Makefile
@@ -1,5 +1,5 @@
#############################################################################
-# boards/risc-v/espressif/common/Makefile
+# boards/risc-v/esp32c6/common/Makefile
#
# 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/espressif/common/include/esp_board_ledc.h
b/boards/risc-v/esp32c6/common/include/esp_board_ledc.h
similarity index 89%
copy from boards/risc-v/espressif/common/include/esp_board_ledc.h
copy to boards/risc-v/esp32c6/common/include/esp_board_ledc.h
index df6bc291a0..cbdb9378f9 100644
--- a/boards/risc-v/espressif/common/include/esp_board_ledc.h
+++ b/boards/risc-v/esp32c6/common/include/esp_board_ledc.h
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/risc-v/espressif/common/include/esp_board_ledc.h
+ * boards/risc-v/esp32c6/common/include/esp_board_ledc.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_ESPRESSIF_COMMON_INCLUDE_ESP_BOARD_LEDC_H
-#define __BOARDS_RISCV_ESPRESSIF_COMMON_INCLUDE_ESP_BOARD_LEDC_H
+#ifndef __BOARDS_RISCV_ESP32C6_COMMON_INCLUDE_ESP_BOARD_LEDC_H
+#define __BOARDS_RISCV_ESP32C6_COMMON_INCLUDE_ESP_BOARD_LEDC_H
/****************************************************************************
* Included Files
@@ -71,4 +71,4 @@ int board_ledc_setup(void);
#endif
#endif /* __ASSEMBLY__ */
-#endif /* __BOARDS_RISCV_ESPRESSIF_COMMON_INCLUDE_ESP_BOARD_LEDC_H */
+#endif /* __BOARDS_RISCV_ESP32C6_COMMON_INCLUDE_ESP_BOARD_LEDC_H */
diff --git a/boards/risc-v/espressif/common/scripts/.gitignore
b/boards/risc-v/esp32c6/common/scripts/.gitignore
similarity index 100%
copy from boards/risc-v/espressif/common/scripts/.gitignore
copy to boards/risc-v/esp32c6/common/scripts/.gitignore
diff --git a/boards/risc-v/espressif/common/scripts/common.ld
b/boards/risc-v/esp32c6/common/scripts/common.ld
similarity index 96%
copy from boards/risc-v/espressif/common/scripts/common.ld
copy to boards/risc-v/esp32c6/common/scripts/common.ld
index 2f93e1b795..09d1012918 100644
--- a/boards/risc-v/espressif/common/scripts/common.ld
+++ b/boards/risc-v/esp32c6/common/scripts/common.ld
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/risc-v/espressif/common/scripts/common.ld
+ * boards/risc-v/esp32c6/common/scripts/common.ld
*
* 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/espressif/common/scripts/esp32c6_aliases.ld
b/boards/risc-v/esp32c6/common/scripts/esp32c6_aliases.ld
similarity index 95%
rename from boards/risc-v/espressif/common/scripts/esp32c6_aliases.ld
rename to boards/risc-v/esp32c6/common/scripts/esp32c6_aliases.ld
index 29335e191c..76606ad25f 100644
--- a/boards/risc-v/espressif/common/scripts/esp32c6_aliases.ld
+++ b/boards/risc-v/esp32c6/common/scripts/esp32c6_aliases.ld
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/risc-v/espressif/common/scripts/esp32c6_aliases.ld
+ * boards/risc-v/esp32c6/common/scripts/esp32c6_aliases.ld
*
* 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/espressif/common/scripts/esp32c6_flat_memory.ld
b/boards/risc-v/esp32c6/common/scripts/esp32c6_flat_memory.ld
similarity index 98%
rename from boards/risc-v/espressif/common/scripts/esp32c6_flat_memory.ld
rename to boards/risc-v/esp32c6/common/scripts/esp32c6_flat_memory.ld
index 3517df7fdb..153fe079a7 100644
--- a/boards/risc-v/espressif/common/scripts/esp32c6_flat_memory.ld
+++ b/boards/risc-v/esp32c6/common/scripts/esp32c6_flat_memory.ld
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/risc-v/espressif/common/scripts/esp32c6_flat_memory.ld
+ * boards/risc-v/esp32c6/common/scripts/esp32c6_flat_memory.ld
*
* 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/espressif/common/scripts/esp32c6_legacy_sections.ld
b/boards/risc-v/esp32c6/common/scripts/esp32c6_legacy_sections.ld
similarity index 99%
rename from boards/risc-v/espressif/common/scripts/esp32c6_legacy_sections.ld
rename to boards/risc-v/esp32c6/common/scripts/esp32c6_legacy_sections.ld
index 95a878a294..0b135ccabb 100644
--- a/boards/risc-v/espressif/common/scripts/esp32c6_legacy_sections.ld
+++ b/boards/risc-v/esp32c6/common/scripts/esp32c6_legacy_sections.ld
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/risc-v/espressif/common/scripts/esp32c6_legacy_sections.ld
+ * boards/risc-v/esp32c6/common/scripts/esp32c6_legacy_sections.ld
*
* 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/espressif/common/src/Make.defs
b/boards/risc-v/esp32c6/common/src/Make.defs
similarity index 96%
copy from boards/risc-v/espressif/common/src/Make.defs
copy to boards/risc-v/esp32c6/common/src/Make.defs
index fff6e89461..6581c3adaa 100644
--- a/boards/risc-v/espressif/common/src/Make.defs
+++ b/boards/risc-v/esp32c6/common/src/Make.defs
@@ -1,5 +1,5 @@
#############################################################################
-# boards/risc-v/espressif/common/src/Make.defs
+# boards/risc-v/esp32c6/common/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/espressif/common/src/esp_board_ledc.c
b/boards/risc-v/esp32c6/common/src/esp_board_ledc.c
similarity index 98%
copy from boards/risc-v/espressif/common/src/esp_board_ledc.c
copy to boards/risc-v/esp32c6/common/src/esp_board_ledc.c
index 5ed796c5cf..4ec63eb80b 100644
--- a/boards/risc-v/espressif/common/src/esp_board_ledc.c
+++ b/boards/risc-v/esp32c6/common/src/esp_board_ledc.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/risc-v/espressif/common/src/esp_board_ledc.c
+ * boards/risc-v/esp32c6/common/src/esp_board_ledc.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/espressif/esp32c6-generic/Kconfig
b/boards/risc-v/esp32c6/esp32c6-devkit/Kconfig
similarity index 67%
rename from boards/risc-v/espressif/esp32c6-generic/Kconfig
rename to boards/risc-v/esp32c6/esp32c6-devkit/Kconfig
index b8f2c2b023..7db16a119d 100644
--- a/boards/risc-v/espressif/esp32c6-generic/Kconfig
+++ b/boards/risc-v/esp32c6/esp32c6-devkit/Kconfig
@@ -3,6 +3,6 @@
# see the file kconfig-language.txt in the NuttX tools repository.
#
-if ARCH_BOARD_ESP32C6_GENERIC
+if ARCH_BOARD_ESP32C6_DEVKIT
-endif # ARCH_BOARD_ESP32C6_GENERIC
+endif # ARCH_BOARD_ESP32C6_DEVKIT
diff --git a/boards/risc-v/espressif/esp32c6-generic/configs/buttons/defconfig
b/boards/risc-v/esp32c6/esp32c6-devkit/configs/buttons/defconfig
similarity index 90%
rename from boards/risc-v/espressif/esp32c6-generic/configs/buttons/defconfig
rename to boards/risc-v/esp32c6/esp32c6-devkit/configs/buttons/defconfig
index 2475ace8f7..8dd05bcb4e 100644
--- a/boards/risc-v/espressif/esp32c6-generic/configs/buttons/defconfig
+++ b/boards/risc-v/esp32c6/esp32c6-devkit/configs/buttons/defconfig
@@ -8,12 +8,12 @@
# CONFIG_NSH_ARGCAT is not set
# CONFIG_NSH_CMDOPT_HEXDUMP is not set
CONFIG_ARCH="risc-v"
-CONFIG_ARCH_BOARD="esp32c6-generic"
+CONFIG_ARCH_BOARD="esp32c6-devkit"
CONFIG_ARCH_BOARD_COMMON=y
-CONFIG_ARCH_BOARD_ESP32C6_GENERIC=y
+CONFIG_ARCH_BOARD_ESP32C6_DEVKIT=y
CONFIG_ARCH_BUTTONS=y
-CONFIG_ARCH_CHIP="espressif"
-CONFIG_ARCH_CHIP_ESPRESSIF=y
+CONFIG_ARCH_CHIP="esp32c6"
+CONFIG_ARCH_CHIP_ESP32C6=y
CONFIG_ARCH_INTERRUPTSTACK=2048
CONFIG_ARCH_IRQBUTTONS=y
CONFIG_ARCH_RISCV=y
diff --git a/boards/risc-v/espressif/esp32c6-generic/configs/gpio/defconfig
b/boards/risc-v/esp32c6/esp32c6-devkit/configs/gpio/defconfig
similarity index 90%
rename from boards/risc-v/espressif/esp32c6-generic/configs/gpio/defconfig
rename to boards/risc-v/esp32c6/esp32c6-devkit/configs/gpio/defconfig
index bf50b0727f..e39b561781 100644
--- a/boards/risc-v/espressif/esp32c6-generic/configs/gpio/defconfig
+++ b/boards/risc-v/esp32c6/esp32c6-devkit/configs/gpio/defconfig
@@ -8,11 +8,11 @@
# CONFIG_NSH_ARGCAT is not set
# CONFIG_NSH_CMDOPT_HEXDUMP is not set
CONFIG_ARCH="risc-v"
-CONFIG_ARCH_BOARD="esp32c6-generic"
+CONFIG_ARCH_BOARD="esp32c6-devkit"
CONFIG_ARCH_BOARD_COMMON=y
-CONFIG_ARCH_BOARD_ESP32C6_GENERIC=y
-CONFIG_ARCH_CHIP="espressif"
-CONFIG_ARCH_CHIP_ESPRESSIF=y
+CONFIG_ARCH_BOARD_ESP32C6_DEVKIT=y
+CONFIG_ARCH_CHIP="esp32c6"
+CONFIG_ARCH_CHIP_ESP32C6=y
CONFIG_ARCH_INTERRUPTSTACK=2048
CONFIG_ARCH_RISCV=y
CONFIG_ARCH_STACKDUMP=y
diff --git a/boards/risc-v/espressif/esp32c6-generic/configs/nsh/defconfig
b/boards/risc-v/esp32c6/esp32c6-devkit/configs/nsh/defconfig
similarity index 90%
copy from boards/risc-v/espressif/esp32c6-generic/configs/nsh/defconfig
copy to boards/risc-v/esp32c6/esp32c6-devkit/configs/nsh/defconfig
index f537416484..49e9027ce5 100644
--- a/boards/risc-v/espressif/esp32c6-generic/configs/nsh/defconfig
+++ b/boards/risc-v/esp32c6/esp32c6-devkit/configs/nsh/defconfig
@@ -8,11 +8,11 @@
# CONFIG_NSH_ARGCAT is not set
# CONFIG_NSH_CMDOPT_HEXDUMP is not set
CONFIG_ARCH="risc-v"
-CONFIG_ARCH_BOARD="esp32c6-generic"
+CONFIG_ARCH_BOARD="esp32c6-devkit"
CONFIG_ARCH_BOARD_COMMON=y
-CONFIG_ARCH_BOARD_ESP32C6_GENERIC=y
-CONFIG_ARCH_CHIP="espressif"
-CONFIG_ARCH_CHIP_ESPRESSIF=y
+CONFIG_ARCH_BOARD_ESP32C6_DEVKIT=y
+CONFIG_ARCH_CHIP="esp32c6"
+CONFIG_ARCH_CHIP_ESP32C6=y
CONFIG_ARCH_INTERRUPTSTACK=2048
CONFIG_ARCH_RISCV=y
CONFIG_ARCH_STACKDUMP=y
diff --git a/boards/risc-v/espressif/esp32c6-generic/configs/ostest/defconfig
b/boards/risc-v/esp32c6/esp32c6-devkit/configs/ostest/defconfig
similarity index 89%
rename from boards/risc-v/espressif/esp32c6-generic/configs/ostest/defconfig
rename to boards/risc-v/esp32c6/esp32c6-devkit/configs/ostest/defconfig
index df57912d1a..2c92e04a82 100644
--- a/boards/risc-v/espressif/esp32c6-generic/configs/ostest/defconfig
+++ b/boards/risc-v/esp32c6/esp32c6-devkit/configs/ostest/defconfig
@@ -8,11 +8,11 @@
# CONFIG_NSH_ARGCAT is not set
# CONFIG_NSH_CMDOPT_HEXDUMP is not set
CONFIG_ARCH="risc-v"
-CONFIG_ARCH_BOARD="esp32c6-generic"
+CONFIG_ARCH_BOARD="esp32c6-devkit"
CONFIG_ARCH_BOARD_COMMON=y
-CONFIG_ARCH_BOARD_ESP32C6_GENERIC=y
-CONFIG_ARCH_CHIP="espressif"
-CONFIG_ARCH_CHIP_ESPRESSIF=y
+CONFIG_ARCH_BOARD_ESP32C6_DEVKIT=y
+CONFIG_ARCH_CHIP="esp32c6"
+CONFIG_ARCH_CHIP_ESP32C6=y
CONFIG_ARCH_INTERRUPTSTACK=2048
CONFIG_ARCH_RISCV=y
CONFIG_ARCH_STACKDUMP=y
diff --git a/boards/risc-v/espressif/esp32c6-generic/configs/pwm/defconfig
b/boards/risc-v/esp32c6/esp32c6-devkit/configs/pwm/defconfig
similarity index 90%
rename from boards/risc-v/espressif/esp32c6-generic/configs/pwm/defconfig
rename to boards/risc-v/esp32c6/esp32c6-devkit/configs/pwm/defconfig
index 1ab64eb317..a73e3528b2 100644
--- a/boards/risc-v/espressif/esp32c6-generic/configs/pwm/defconfig
+++ b/boards/risc-v/esp32c6/esp32c6-devkit/configs/pwm/defconfig
@@ -8,11 +8,11 @@
# CONFIG_NSH_ARGCAT is not set
# CONFIG_NSH_CMDOPT_HEXDUMP is not set
CONFIG_ARCH="risc-v"
-CONFIG_ARCH_BOARD="esp32c6-generic"
+CONFIG_ARCH_BOARD="esp32c6-devkit"
CONFIG_ARCH_BOARD_COMMON=y
-CONFIG_ARCH_BOARD_ESP32C6_GENERIC=y
-CONFIG_ARCH_CHIP="espressif"
-CONFIG_ARCH_CHIP_ESPRESSIF=y
+CONFIG_ARCH_BOARD_ESP32C6_DEVKIT=y
+CONFIG_ARCH_CHIP="esp32c6"
+CONFIG_ARCH_CHIP_ESP32C6=y
CONFIG_ARCH_INTERRUPTSTACK=2048
CONFIG_ARCH_RISCV=y
CONFIG_ARCH_STACKDUMP=y
diff --git a/boards/risc-v/espressif/esp32c6-generic/configs/random/defconfig
b/boards/risc-v/esp32c6/esp32c6-devkit/configs/random/defconfig
similarity index 90%
rename from boards/risc-v/espressif/esp32c6-generic/configs/random/defconfig
rename to boards/risc-v/esp32c6/esp32c6-devkit/configs/random/defconfig
index f9853f9332..157d9a948c 100644
--- a/boards/risc-v/espressif/esp32c6-generic/configs/random/defconfig
+++ b/boards/risc-v/esp32c6/esp32c6-devkit/configs/random/defconfig
@@ -8,11 +8,11 @@
# CONFIG_NSH_ARGCAT is not set
# CONFIG_NSH_CMDOPT_HEXDUMP is not set
CONFIG_ARCH="risc-v"
-CONFIG_ARCH_BOARD="esp32c6-generic"
+CONFIG_ARCH_BOARD="esp32c6-devkit"
CONFIG_ARCH_BOARD_COMMON=y
-CONFIG_ARCH_BOARD_ESP32C6_GENERIC=y
-CONFIG_ARCH_CHIP="espressif"
-CONFIG_ARCH_CHIP_ESPRESSIF=y
+CONFIG_ARCH_BOARD_ESP32C6_DEVKIT=y
+CONFIG_ARCH_CHIP="esp32c6"
+CONFIG_ARCH_CHIP_ESP32C6=y
CONFIG_ARCH_INTERRUPTSTACK=2048
CONFIG_ARCH_RISCV=y
CONFIG_ARCH_STACKDUMP=y
diff --git a/boards/risc-v/espressif/esp32c6-generic/configs/rtc/defconfig
b/boards/risc-v/esp32c6/esp32c6-devkit/configs/rtc/defconfig
similarity index 90%
rename from boards/risc-v/espressif/esp32c6-generic/configs/rtc/defconfig
rename to boards/risc-v/esp32c6/esp32c6-devkit/configs/rtc/defconfig
index 3d6988d808..7b7d6ad00c 100644
--- a/boards/risc-v/espressif/esp32c6-generic/configs/rtc/defconfig
+++ b/boards/risc-v/esp32c6/esp32c6-devkit/configs/rtc/defconfig
@@ -8,11 +8,11 @@
# CONFIG_NSH_ARGCAT is not set
# CONFIG_NSH_CMDOPT_HEXDUMP is not set
CONFIG_ARCH="risc-v"
-CONFIG_ARCH_BOARD="esp32c6-generic"
+CONFIG_ARCH_BOARD="esp32c6-devkit"
CONFIG_ARCH_BOARD_COMMON=y
-CONFIG_ARCH_BOARD_ESP32C6_GENERIC=y
-CONFIG_ARCH_CHIP="espressif"
-CONFIG_ARCH_CHIP_ESPRESSIF=y
+CONFIG_ARCH_BOARD_ESP32C6_DEVKIT=y
+CONFIG_ARCH_CHIP="esp32c6"
+CONFIG_ARCH_CHIP_ESP32C6=y
CONFIG_ARCH_INTERRUPTSTACK=1536
CONFIG_ARCH_RISCV=y
CONFIG_ARCH_STACKDUMP=y
diff --git a/boards/risc-v/espressif/esp32c6-generic/configs/nsh/defconfig
b/boards/risc-v/esp32c6/esp32c6-devkit/configs/sotest/defconfig
similarity index 79%
rename from boards/risc-v/espressif/esp32c6-generic/configs/nsh/defconfig
rename to boards/risc-v/esp32c6/esp32c6-devkit/configs/sotest/defconfig
index f537416484..2fe32a2007 100644
--- a/boards/risc-v/espressif/esp32c6-generic/configs/nsh/defconfig
+++ b/boards/risc-v/esp32c6/esp32c6-devkit/configs/sotest/defconfig
@@ -8,11 +8,11 @@
# CONFIG_NSH_ARGCAT is not set
# CONFIG_NSH_CMDOPT_HEXDUMP is not set
CONFIG_ARCH="risc-v"
-CONFIG_ARCH_BOARD="esp32c6-generic"
+CONFIG_ARCH_BOARD="esp32c6-devkit"
CONFIG_ARCH_BOARD_COMMON=y
-CONFIG_ARCH_BOARD_ESP32C6_GENERIC=y
-CONFIG_ARCH_CHIP="espressif"
-CONFIG_ARCH_CHIP_ESPRESSIF=y
+CONFIG_ARCH_BOARD_ESP32C6_DEVKIT=y
+CONFIG_ARCH_CHIP="esp32c6"
+CONFIG_ARCH_CHIP_ESP32C6=y
CONFIG_ARCH_INTERRUPTSTACK=2048
CONFIG_ARCH_RISCV=y
CONFIG_ARCH_STACKDUMP=y
@@ -21,16 +21,22 @@ CONFIG_BOARD_LOOPSPERMSEC=15000
CONFIG_BUILTIN=y
CONFIG_DEV_ZERO=y
CONFIG_ESPRESSIF_ESP32C6=y
+CONFIG_EXAMPLES_SOTEST=y
CONFIG_FS_PROCFS=y
-CONFIG_IDLETHREAD_STACKSIZE=2048
+CONFIG_FS_ROMFS=y
+CONFIG_HAVE_CXX=y
+CONFIG_HAVE_CXXINITIALIZE=y
+CONFIG_IDLETHREAD_STACKSIZE=3072
CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
+CONFIG_LIBC_DLFCN=y
CONFIG_LIBC_PERROR_STDOUT=y
CONFIG_LIBC_STRERROR=y
CONFIG_NFILE_DESCRIPTORS_PER_BLOCK=6
CONFIG_NSH_ARCHINIT=y
CONFIG_NSH_BUILTIN_APPS=y
CONFIG_NSH_FILEIOSIZE=512
+CONFIG_NSH_LINELEN=64
CONFIG_NSH_READLINE=y
CONFIG_NSH_STRERROR=y
CONFIG_PREALLOC_TIMERS=0
diff --git a/boards/risc-v/espressif/esp32c6-generic/configs/tickless/defconfig
b/boards/risc-v/esp32c6/esp32c6-devkit/configs/tickless/defconfig
similarity index 90%
rename from boards/risc-v/espressif/esp32c6-generic/configs/tickless/defconfig
rename to boards/risc-v/esp32c6/esp32c6-devkit/configs/tickless/defconfig
index 2bd1369757..1a4170be1b 100644
--- a/boards/risc-v/espressif/esp32c6-generic/configs/tickless/defconfig
+++ b/boards/risc-v/esp32c6/esp32c6-devkit/configs/tickless/defconfig
@@ -8,11 +8,11 @@
# CONFIG_NSH_ARGCAT is not set
# CONFIG_NSH_CMDOPT_HEXDUMP is not set
CONFIG_ARCH="risc-v"
-CONFIG_ARCH_BOARD="esp32c6-generic"
+CONFIG_ARCH_BOARD="esp32c6-devkit"
CONFIG_ARCH_BOARD_COMMON=y
-CONFIG_ARCH_BOARD_ESP32C6_GENERIC=y
-CONFIG_ARCH_CHIP="espressif"
-CONFIG_ARCH_CHIP_ESPRESSIF=y
+CONFIG_ARCH_BOARD_ESP32C6_DEVKIT=y
+CONFIG_ARCH_CHIP="esp32c6"
+CONFIG_ARCH_CHIP_ESP32C6=y
CONFIG_ARCH_INTERRUPTSTACK=2048
CONFIG_ARCH_RISCV=y
CONFIG_ARCH_STACKDUMP=y
diff --git a/boards/risc-v/espressif/esp32c6-generic/configs/timers/defconfig
b/boards/risc-v/esp32c6/esp32c6-devkit/configs/timers/defconfig
similarity index 90%
rename from boards/risc-v/espressif/esp32c6-generic/configs/timers/defconfig
rename to boards/risc-v/esp32c6/esp32c6-devkit/configs/timers/defconfig
index c36bb8b8b4..286c12139d 100644
--- a/boards/risc-v/espressif/esp32c6-generic/configs/timers/defconfig
+++ b/boards/risc-v/esp32c6/esp32c6-devkit/configs/timers/defconfig
@@ -8,11 +8,11 @@
# CONFIG_NSH_ARGCAT is not set
# CONFIG_NSH_CMDOPT_HEXDUMP is not set
CONFIG_ARCH="risc-v"
-CONFIG_ARCH_BOARD="esp32c6-generic"
+CONFIG_ARCH_BOARD="esp32c6-devkit"
CONFIG_ARCH_BOARD_COMMON=y
-CONFIG_ARCH_BOARD_ESP32C6_GENERIC=y
-CONFIG_ARCH_CHIP="espressif"
-CONFIG_ARCH_CHIP_ESPRESSIF=y
+CONFIG_ARCH_BOARD_ESP32C6_DEVKIT=y
+CONFIG_ARCH_CHIP="esp32c6"
+CONFIG_ARCH_CHIP_ESP32C6=y
CONFIG_ARCH_INTERRUPTSTACK=1536
CONFIG_ARCH_RISCV=y
CONFIG_ARCH_STACKDUMP=y
diff --git
a/boards/risc-v/espressif/esp32c6-generic/configs/usbconsole/defconfig
b/boards/risc-v/esp32c6/esp32c6-devkit/configs/usbconsole/defconfig
similarity index 90%
rename from boards/risc-v/espressif/esp32c6-generic/configs/usbconsole/defconfig
rename to boards/risc-v/esp32c6/esp32c6-devkit/configs/usbconsole/defconfig
index ab2d8f96cd..0bba6e4d40 100644
--- a/boards/risc-v/espressif/esp32c6-generic/configs/usbconsole/defconfig
+++ b/boards/risc-v/esp32c6/esp32c6-devkit/configs/usbconsole/defconfig
@@ -9,11 +9,11 @@
# CONFIG_NSH_ARGCAT is not set
# CONFIG_NSH_CMDOPT_HEXDUMP is not set
CONFIG_ARCH="risc-v"
-CONFIG_ARCH_BOARD="esp32c6-generic"
+CONFIG_ARCH_BOARD="esp32c6-devkit"
CONFIG_ARCH_BOARD_COMMON=y
-CONFIG_ARCH_BOARD_ESP32C6_GENERIC=y
-CONFIG_ARCH_CHIP="espressif"
-CONFIG_ARCH_CHIP_ESPRESSIF=y
+CONFIG_ARCH_BOARD_ESP32C6_DEVKIT=y
+CONFIG_ARCH_CHIP="esp32c6"
+CONFIG_ARCH_CHIP_ESP32C6=y
CONFIG_ARCH_INTERRUPTSTACK=2048
CONFIG_ARCH_RISCV=y
CONFIG_ARCH_STACKDUMP=y
diff --git a/boards/risc-v/espressif/esp32c6-generic/configs/watchdog/defconfig
b/boards/risc-v/esp32c6/esp32c6-devkit/configs/watchdog/defconfig
similarity index 90%
rename from boards/risc-v/espressif/esp32c6-generic/configs/watchdog/defconfig
rename to boards/risc-v/esp32c6/esp32c6-devkit/configs/watchdog/defconfig
index 6b0858915a..572ddf606e 100644
--- a/boards/risc-v/espressif/esp32c6-generic/configs/watchdog/defconfig
+++ b/boards/risc-v/esp32c6/esp32c6-devkit/configs/watchdog/defconfig
@@ -8,11 +8,11 @@
# CONFIG_NSH_ARGCAT is not set
# CONFIG_NSH_CMDOPT_HEXDUMP is not set
CONFIG_ARCH="risc-v"
-CONFIG_ARCH_BOARD="esp32c6-generic"
+CONFIG_ARCH_BOARD="esp32c6-devkit"
CONFIG_ARCH_BOARD_COMMON=y
-CONFIG_ARCH_BOARD_ESP32C6_GENERIC=y
-CONFIG_ARCH_CHIP="espressif"
-CONFIG_ARCH_CHIP_ESPRESSIF=y
+CONFIG_ARCH_BOARD_ESP32C6_DEVKIT=y
+CONFIG_ARCH_CHIP="esp32c6"
+CONFIG_ARCH_CHIP_ESP32C6=y
CONFIG_ARCH_INTERRUPTSTACK=2048
CONFIG_ARCH_RISCV=y
CONFIG_ARCH_STACKDUMP=y
diff --git a/boards/risc-v/espressif/esp32c6-generic/include/board.h
b/boards/risc-v/esp32c6/esp32c6-devkit/include/board.h
similarity index 84%
rename from boards/risc-v/espressif/esp32c6-generic/include/board.h
rename to boards/risc-v/esp32c6/esp32c6-devkit/include/board.h
index 2a07d2e4cf..fbea1a6556 100644
--- a/boards/risc-v/espressif/esp32c6-generic/include/board.h
+++ b/boards/risc-v/esp32c6/esp32c6-devkit/include/board.h
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/risc-v/espressif/esp32c6-generic/include/board.h
+ * boards/risc-v/esp32c6/esp32c6-devkit/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_ESPRESSIF_ESP32C6_GENERIC_INCLUDE_BOARD_H
-#define __BOARDS_RISCV_ESPRESSIF_ESP32C6_GENERIC_INCLUDE_BOARD_H
+#ifndef __BOARDS_RISCV_ESP32C6_ESP32C6_DEVKIT_INCLUDE_BOARD_H
+#define __BOARDS_RISCV_ESP32C6_ESP32C6_DEVKIT_INCLUDE_BOARD_H
/****************************************************************************
* Pre-processor Definitions
@@ -36,5 +36,5 @@
#define BUTTON_BOOT 9
-#endif /* __BOARDS_RISCV_ESPRESSIF_ESP32C6_GENERIC_INCLUDE_BOARD_H */
+#endif /* __BOARDS_RISCV_ESP32C6_ESP32C6_DEVKIT_INCLUDE_BOARD_H */
diff --git a/boards/risc-v/espressif/esp32c6-generic/scripts/Make.defs
b/boards/risc-v/esp32c6/esp32c6-devkit/scripts/Make.defs
similarity index 97%
rename from boards/risc-v/espressif/esp32c6-generic/scripts/Make.defs
rename to boards/risc-v/esp32c6/esp32c6-devkit/scripts/Make.defs
index 792bef6cd7..772e068095 100644
--- a/boards/risc-v/espressif/esp32c6-generic/scripts/Make.defs
+++ b/boards/risc-v/esp32c6/esp32c6-devkit/scripts/Make.defs
@@ -1,5 +1,5 @@
############################################################################
-# boards/risc-v/espressif/esp32c6-generic/scripts/Make.defs
+# boards/risc-v/esp32c6/esp32c6-devkit/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/espressif/esp32c6-generic/src/Make.defs
b/boards/risc-v/esp32c6/esp32c6-devkit/src/Make.defs
similarity index 96%
rename from boards/risc-v/espressif/esp32c6-generic/src/Make.defs
rename to boards/risc-v/esp32c6/esp32c6-devkit/src/Make.defs
index bbd7474093..4de110b7d3 100644
--- a/boards/risc-v/espressif/esp32c6-generic/src/Make.defs
+++ b/boards/risc-v/esp32c6/esp32c6-devkit/src/Make.defs
@@ -1,5 +1,5 @@
#############################################################################
-# boards/risc-v/espressif/esp32c6-generic/src/Make.defs
+# boards/risc-v/esp32c6/esp32c6-devkit/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/espressif/esp32h2-generic/src/esp32h2-generic.h
b/boards/risc-v/esp32c6/esp32c6-devkit/src/esp32c6-devkit.h
similarity index 91%
rename from boards/risc-v/espressif/esp32h2-generic/src/esp32h2-generic.h
rename to boards/risc-v/esp32c6/esp32c6-devkit/src/esp32c6-devkit.h
index 4afa8f622a..ad6766b0e4 100644
--- a/boards/risc-v/espressif/esp32h2-generic/src/esp32h2-generic.h
+++ b/boards/risc-v/esp32c6/esp32c6-devkit/src/esp32c6-devkit.h
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/risc-v/espressif/esp32h2-generic/src/esp32h2-generic.h
+ * boards/risc-v/esp32c6/esp32c6-devkit/src/esp32c6-devkit.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_ESPRESSIF_ESP32H2_GENERIC_SRC_ESP32H2_GENERIC_H
-#define __BOARDS_RISCV_ESPRESSIF_ESP32H2_GENERIC_SRC_ESP32H2_GENERIC_H
+#ifndef __BOARDS_RISCV_ESP32C6_ESP32C6_DEVKIT_SRC_ESP32C6_DEVKIT_H
+#define __BOARDS_RISCV_ESP32C6_ESP32C6_DEVKIT_SRC_ESP32C6_DEVKIT_H
/****************************************************************************
* Included Files
@@ -84,4 +84,4 @@ int esp_gpio_init(void);
#endif
#endif /* __ASSEMBLY__ */
-#endif /* __BOARDS_RISCV_ESPRESSIF_ESP32H2_GENERIC_SRC_ESP32H2_GENERIC_H */
+#endif /* __BOARDS_RISCV_ESP32C6_ESP32C6_DEVKIT_SRC_ESP32C6_DEVKIT_H */
diff --git a/boards/risc-v/espressif/esp32c6-generic/src/esp32c6_appinit.c
b/boards/risc-v/esp32c6/esp32c6-devkit/src/esp32c6_appinit.c
similarity index 97%
rename from boards/risc-v/espressif/esp32c6-generic/src/esp32c6_appinit.c
rename to boards/risc-v/esp32c6/esp32c6-devkit/src/esp32c6_appinit.c
index 2097b7046b..47472cda4d 100644
--- a/boards/risc-v/espressif/esp32c6-generic/src/esp32c6_appinit.c
+++ b/boards/risc-v/esp32c6/esp32c6-devkit/src/esp32c6_appinit.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/risc-v/espressif/esp32c6-generic/src/esp32c6_appinit.c
+ * boards/risc-v/esp32c6/esp32c6-devkit/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-generic.h"
+#include "esp32c6-devkit.h"
#ifdef CONFIG_BOARDCTL
diff --git a/boards/risc-v/espressif/esp32c6-generic/src/esp32c6_boot.c
b/boards/risc-v/esp32c6/esp32c6-devkit/src/esp32c6_boot.c
similarity index 98%
rename from boards/risc-v/espressif/esp32c6-generic/src/esp32c6_boot.c
rename to boards/risc-v/esp32c6/esp32c6-devkit/src/esp32c6_boot.c
index c22b26cd1f..c1efc4ec02 100644
--- a/boards/risc-v/espressif/esp32c6-generic/src/esp32c6_boot.c
+++ b/boards/risc-v/esp32c6/esp32c6-devkit/src/esp32c6_boot.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/risc-v/espressif/esp32c6-generic/src/esp32c6_boot.c
+ * boards/risc-v/esp32c6/esp32c6-devkit/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/espressif/esp32c6-generic/src/esp32c6_bringup.c
b/boards/risc-v/esp32c6/esp32c6-devkit/src/esp32c6_bringup.c
similarity index 98%
rename from boards/risc-v/espressif/esp32c6-generic/src/esp32c6_bringup.c
rename to boards/risc-v/esp32c6/esp32c6-devkit/src/esp32c6_bringup.c
index 7a1416c854..642c27b27b 100644
--- a/boards/risc-v/espressif/esp32c6-generic/src/esp32c6_bringup.c
+++ b/boards/risc-v/esp32c6/esp32c6-devkit/src/esp32c6_bringup.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/risc-v/espressif/esp32c6-generic/src/esp32c6_bringup.c
+ * boards/risc-v/esp32c6/esp32c6-devkit/src/esp32c6_bringup.c
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -60,7 +60,7 @@
# include <nuttx/input/buttons.h>
#endif
-#include "esp32c6-generic.h"
+#include "esp32c6-devkit.h"
/****************************************************************************
* Pre-processor Definitions
diff --git a/boards/risc-v/espressif/esp32c6-generic/src/esp32c6_buttons.c
b/boards/risc-v/esp32c6/esp32c6-devkit/src/esp32c6_buttons.c
similarity index 98%
rename from boards/risc-v/espressif/esp32c6-generic/src/esp32c6_buttons.c
rename to boards/risc-v/esp32c6/esp32c6-devkit/src/esp32c6_buttons.c
index 5d62f0bf1e..57598946fd 100644
--- a/boards/risc-v/espressif/esp32c6-generic/src/esp32c6_buttons.c
+++ b/boards/risc-v/esp32c6/esp32c6-devkit/src/esp32c6_buttons.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/risc-v/espressif/esp32c6-generic/src/esp32c6_buttons.c
+ * boards/risc-v/esp32c6/esp32c6-devkit/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-generic.h"
+#include "esp32c6-devkit.h"
#include <arch/board/board.h>
/****************************************************************************
diff --git a/boards/risc-v/espressif/esp32c6-generic/src/esp32c6_gpio.c
b/boards/risc-v/esp32c6/esp32c6-devkit/src/esp32c6_gpio.c
similarity index 99%
rename from boards/risc-v/espressif/esp32c6-generic/src/esp32c6_gpio.c
rename to boards/risc-v/esp32c6/esp32c6-devkit/src/esp32c6_gpio.c
index e5e1f19391..9cb3a8ca0a 100644
--- a/boards/risc-v/espressif/esp32c6-generic/src/esp32c6_gpio.c
+++ b/boards/risc-v/esp32c6/esp32c6-devkit/src/esp32c6_gpio.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/risc-v/espressif/esp32c6-generic/src/esp32c6_gpio.c
+ * boards/risc-v/esp32c6/esp32c6-devkit/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-generic.h"
+#include "esp32c6-devkit.h"
#include <arch/board/board.h>
/* HAL */
diff --git a/boards/risc-v/espressif/esp32c6-generic/src/esp32c6_reset.c
b/boards/risc-v/esp32c6/esp32c6-devkit/src/esp32c6_reset.c
similarity index 97%
rename from boards/risc-v/espressif/esp32c6-generic/src/esp32c6_reset.c
rename to boards/risc-v/esp32c6/esp32c6-devkit/src/esp32c6_reset.c
index 50afc731a2..024764c5a2 100644
--- a/boards/risc-v/espressif/esp32c6-generic/src/esp32c6_reset.c
+++ b/boards/risc-v/esp32c6/esp32c6-devkit/src/esp32c6_reset.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/risc-v/espressif/esp32c6-generic/src/esp32c6_reset.c
+ * boards/risc-v/esp32c6/esp32c6-devkit/src/esp32c6_reset.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/espressif/common/Kconfig
b/boards/risc-v/esp32h2/common/Kconfig
similarity index 100%
rename from boards/risc-v/espressif/common/Kconfig
rename to boards/risc-v/esp32h2/common/Kconfig
diff --git a/boards/risc-v/espressif/common/Makefile
b/boards/risc-v/esp32h2/common/Makefile
similarity index 96%
rename from boards/risc-v/espressif/common/Makefile
rename to boards/risc-v/esp32h2/common/Makefile
index 546b3a62b4..2d123bc645 100644
--- a/boards/risc-v/espressif/common/Makefile
+++ b/boards/risc-v/esp32h2/common/Makefile
@@ -1,5 +1,5 @@
#############################################################################
-# boards/risc-v/espressif/common/Makefile
+# boards/risc-v/esp32h2/common/Makefile
#
# 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/espressif/common/include/esp_board_ledc.h
b/boards/risc-v/esp32h2/common/include/esp_board_ledc.h
similarity index 89%
rename from boards/risc-v/espressif/common/include/esp_board_ledc.h
rename to boards/risc-v/esp32h2/common/include/esp_board_ledc.h
index df6bc291a0..2737e3564d 100644
--- a/boards/risc-v/espressif/common/include/esp_board_ledc.h
+++ b/boards/risc-v/esp32h2/common/include/esp_board_ledc.h
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/risc-v/espressif/common/include/esp_board_ledc.h
+ * boards/risc-v/esp32h2/common/include/esp_board_ledc.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_ESPRESSIF_COMMON_INCLUDE_ESP_BOARD_LEDC_H
-#define __BOARDS_RISCV_ESPRESSIF_COMMON_INCLUDE_ESP_BOARD_LEDC_H
+#ifndef __BOARDS_RISCV_ESP32H2_COMMON_INCLUDE_ESP_BOARD_LEDC_H
+#define __BOARDS_RISCV_ESP32H2_COMMON_INCLUDE_ESP_BOARD_LEDC_H
/****************************************************************************
* Included Files
@@ -71,4 +71,4 @@ int board_ledc_setup(void);
#endif
#endif /* __ASSEMBLY__ */
-#endif /* __BOARDS_RISCV_ESPRESSIF_COMMON_INCLUDE_ESP_BOARD_LEDC_H */
+#endif /* __BOARDS_RISCV_ESP32H2_COMMON_INCLUDE_ESP_BOARD_LEDC_H */
diff --git a/boards/risc-v/espressif/common/scripts/.gitignore
b/boards/risc-v/esp32h2/common/scripts/.gitignore
similarity index 100%
rename from boards/risc-v/espressif/common/scripts/.gitignore
rename to boards/risc-v/esp32h2/common/scripts/.gitignore
diff --git a/boards/risc-v/espressif/common/scripts/common.ld
b/boards/risc-v/esp32h2/common/scripts/common.ld
similarity index 96%
rename from boards/risc-v/espressif/common/scripts/common.ld
rename to boards/risc-v/esp32h2/common/scripts/common.ld
index 2f93e1b795..3265d61d88 100644
--- a/boards/risc-v/espressif/common/scripts/common.ld
+++ b/boards/risc-v/esp32h2/common/scripts/common.ld
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/risc-v/espressif/common/scripts/common.ld
+ * boards/risc-v/esp32h2/common/scripts/common.ld
*
* 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/espressif/common/scripts/esp32h2_aliases.ld
b/boards/risc-v/esp32h2/common/scripts/esp32h2_aliases.ld
similarity index 95%
rename from boards/risc-v/espressif/common/scripts/esp32h2_aliases.ld
rename to boards/risc-v/esp32h2/common/scripts/esp32h2_aliases.ld
index 89c145fbb1..d90bc34503 100644
--- a/boards/risc-v/espressif/common/scripts/esp32h2_aliases.ld
+++ b/boards/risc-v/esp32h2/common/scripts/esp32h2_aliases.ld
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/risc-v/espressif/common/scripts/esp32h2_aliases.ld
+ * boards/risc-v/esp32h2/common/scripts/esp32h2_aliases.ld
*
* 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/espressif/common/scripts/esp32h2_flat_memory.ld
b/boards/risc-v/esp32h2/common/scripts/esp32h2_flat_memory.ld
similarity index 98%
rename from boards/risc-v/espressif/common/scripts/esp32h2_flat_memory.ld
rename to boards/risc-v/esp32h2/common/scripts/esp32h2_flat_memory.ld
index 8d86c12da9..87b97c1ce1 100644
--- a/boards/risc-v/espressif/common/scripts/esp32h2_flat_memory.ld
+++ b/boards/risc-v/esp32h2/common/scripts/esp32h2_flat_memory.ld
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/risc-v/espressif/common/scripts/esp32h2_flat_memory.ld
+ * boards/risc-v/esp32h2/common/scripts/esp32h2_flat_memory.ld
*
* 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/espressif/common/scripts/esp32h2_legacy_sections.ld
b/boards/risc-v/esp32h2/common/scripts/esp32h2_legacy_sections.ld
similarity index 99%
rename from boards/risc-v/espressif/common/scripts/esp32h2_legacy_sections.ld
rename to boards/risc-v/esp32h2/common/scripts/esp32h2_legacy_sections.ld
index b40e931408..7f6a24a8e4 100644
--- a/boards/risc-v/espressif/common/scripts/esp32h2_legacy_sections.ld
+++ b/boards/risc-v/esp32h2/common/scripts/esp32h2_legacy_sections.ld
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/risc-v/espressif/common/scripts/esp32h2_legacy_sections.ld
+ * boards/risc-v/esp32h2/common/scripts/esp32h2_legacy_sections.ld
*
* 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/espressif/common/src/Make.defs
b/boards/risc-v/esp32h2/common/src/Make.defs
similarity index 96%
rename from boards/risc-v/espressif/common/src/Make.defs
rename to boards/risc-v/esp32h2/common/src/Make.defs
index fff6e89461..2dee42cd04 100644
--- a/boards/risc-v/espressif/common/src/Make.defs
+++ b/boards/risc-v/esp32h2/common/src/Make.defs
@@ -1,5 +1,5 @@
#############################################################################
-# boards/risc-v/espressif/common/src/Make.defs
+# boards/risc-v/esp32h2/common/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/espressif/common/src/esp_board_ledc.c
b/boards/risc-v/esp32h2/common/src/esp_board_ledc.c
similarity index 98%
rename from boards/risc-v/espressif/common/src/esp_board_ledc.c
rename to boards/risc-v/esp32h2/common/src/esp_board_ledc.c
index 5ed796c5cf..cfc95bfd7a 100644
--- a/boards/risc-v/espressif/common/src/esp_board_ledc.c
+++ b/boards/risc-v/esp32h2/common/src/esp_board_ledc.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/risc-v/espressif/common/src/esp_board_ledc.c
+ * boards/risc-v/esp32h2/common/src/esp_board_ledc.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/espressif/esp32h2-generic/Kconfig
b/boards/risc-v/esp32h2/esp32h2-devkit/Kconfig
similarity index 100%
rename from boards/risc-v/espressif/esp32h2-generic/Kconfig
rename to boards/risc-v/esp32h2/esp32h2-devkit/Kconfig
diff --git a/boards/risc-v/espressif/esp32h2-generic/configs/buttons/defconfig
b/boards/risc-v/esp32h2/esp32h2-devkit/configs/buttons/defconfig
similarity index 90%
rename from boards/risc-v/espressif/esp32h2-generic/configs/buttons/defconfig
rename to boards/risc-v/esp32h2/esp32h2-devkit/configs/buttons/defconfig
index 3bbf7f8489..4662baad21 100644
--- a/boards/risc-v/espressif/esp32h2-generic/configs/buttons/defconfig
+++ b/boards/risc-v/esp32h2/esp32h2-devkit/configs/buttons/defconfig
@@ -8,12 +8,12 @@
# CONFIG_NSH_ARGCAT is not set
# CONFIG_NSH_CMDOPT_HEXDUMP is not set
CONFIG_ARCH="risc-v"
-CONFIG_ARCH_BOARD="esp32h2-generic"
+CONFIG_ARCH_BOARD="esp32h2-devkit"
CONFIG_ARCH_BOARD_COMMON=y
-CONFIG_ARCH_BOARD_ESP32H2_GENERIC=y
+CONFIG_ARCH_BOARD_ESP32H2_DEVKIT=y
CONFIG_ARCH_BUTTONS=y
-CONFIG_ARCH_CHIP="espressif"
-CONFIG_ARCH_CHIP_ESPRESSIF=y
+CONFIG_ARCH_CHIP="esp32h2"
+CONFIG_ARCH_CHIP_ESP32H2=y
CONFIG_ARCH_INTERRUPTSTACK=2048
CONFIG_ARCH_IRQBUTTONS=y
CONFIG_ARCH_RISCV=y
diff --git a/boards/risc-v/espressif/esp32h2-generic/configs/gpio/defconfig
b/boards/risc-v/esp32h2/esp32h2-devkit/configs/gpio/defconfig
similarity index 90%
rename from boards/risc-v/espressif/esp32h2-generic/configs/gpio/defconfig
rename to boards/risc-v/esp32h2/esp32h2-devkit/configs/gpio/defconfig
index 8183b29d4e..4c4a880124 100644
--- a/boards/risc-v/espressif/esp32h2-generic/configs/gpio/defconfig
+++ b/boards/risc-v/esp32h2/esp32h2-devkit/configs/gpio/defconfig
@@ -8,11 +8,11 @@
# CONFIG_NSH_ARGCAT is not set
# CONFIG_NSH_CMDOPT_HEXDUMP is not set
CONFIG_ARCH="risc-v"
-CONFIG_ARCH_BOARD="esp32h2-generic"
+CONFIG_ARCH_BOARD="esp32h2-devkit"
CONFIG_ARCH_BOARD_COMMON=y
-CONFIG_ARCH_BOARD_ESP32H2_GENERIC=y
-CONFIG_ARCH_CHIP="espressif"
-CONFIG_ARCH_CHIP_ESPRESSIF=y
+CONFIG_ARCH_BOARD_ESP32H2_DEVKIT=y
+CONFIG_ARCH_CHIP="esp32h2"
+CONFIG_ARCH_CHIP_ESP32H2=y
CONFIG_ARCH_INTERRUPTSTACK=2048
CONFIG_ARCH_RISCV=y
CONFIG_ARCH_STACKDUMP=y
diff --git a/boards/risc-v/espressif/esp32h2-generic/configs/nsh/defconfig
b/boards/risc-v/esp32h2/esp32h2-devkit/configs/nsh/defconfig
similarity index 90%
rename from boards/risc-v/espressif/esp32h2-generic/configs/nsh/defconfig
rename to boards/risc-v/esp32h2/esp32h2-devkit/configs/nsh/defconfig
index c06a765e64..3e02bebfd2 100644
--- a/boards/risc-v/espressif/esp32h2-generic/configs/nsh/defconfig
+++ b/boards/risc-v/esp32h2/esp32h2-devkit/configs/nsh/defconfig
@@ -8,11 +8,11 @@
# CONFIG_NSH_ARGCAT is not set
# CONFIG_NSH_CMDOPT_HEXDUMP is not set
CONFIG_ARCH="risc-v"
-CONFIG_ARCH_BOARD="esp32h2-generic"
+CONFIG_ARCH_BOARD="esp32h2-devkit"
CONFIG_ARCH_BOARD_COMMON=y
-CONFIG_ARCH_BOARD_ESP32H2_GENERIC=y
-CONFIG_ARCH_CHIP="espressif"
-CONFIG_ARCH_CHIP_ESPRESSIF=y
+CONFIG_ARCH_BOARD_ESP32H2_DEVKIT=y
+CONFIG_ARCH_CHIP="esp32h2"
+CONFIG_ARCH_CHIP_ESP32H2=y
CONFIG_ARCH_INTERRUPTSTACK=2048
CONFIG_ARCH_RISCV=y
CONFIG_ARCH_STACKDUMP=y
diff --git a/boards/risc-v/espressif/esp32h2-generic/configs/pwm/defconfig
b/boards/risc-v/esp32h2/esp32h2-devkit/configs/pwm/defconfig
similarity index 90%
rename from boards/risc-v/espressif/esp32h2-generic/configs/pwm/defconfig
rename to boards/risc-v/esp32h2/esp32h2-devkit/configs/pwm/defconfig
index eb4aa24473..1ccb576da7 100644
--- a/boards/risc-v/espressif/esp32h2-generic/configs/pwm/defconfig
+++ b/boards/risc-v/esp32h2/esp32h2-devkit/configs/pwm/defconfig
@@ -8,11 +8,11 @@
# CONFIG_NSH_ARGCAT is not set
# CONFIG_NSH_CMDOPT_HEXDUMP is not set
CONFIG_ARCH="risc-v"
-CONFIG_ARCH_BOARD="esp32h2-generic"
+CONFIG_ARCH_BOARD="esp32h2-devkit"
CONFIG_ARCH_BOARD_COMMON=y
-CONFIG_ARCH_BOARD_ESP32H2_GENERIC=y
-CONFIG_ARCH_CHIP="espressif"
-CONFIG_ARCH_CHIP_ESPRESSIF=y
+CONFIG_ARCH_BOARD_ESP32H2_DEVKIT=y
+CONFIG_ARCH_CHIP="esp32h2"
+CONFIG_ARCH_CHIP_ESP32H2=y
CONFIG_ARCH_INTERRUPTSTACK=2048
CONFIG_ARCH_RISCV=y
CONFIG_ARCH_STACKDUMP=y
diff --git a/boards/risc-v/espressif/esp32h2-generic/configs/random/defconfig
b/boards/risc-v/esp32h2/esp32h2-devkit/configs/random/defconfig
similarity index 90%
rename from boards/risc-v/espressif/esp32h2-generic/configs/random/defconfig
rename to boards/risc-v/esp32h2/esp32h2-devkit/configs/random/defconfig
index 55b4548abc..e8e53d015d 100644
--- a/boards/risc-v/espressif/esp32h2-generic/configs/random/defconfig
+++ b/boards/risc-v/esp32h2/esp32h2-devkit/configs/random/defconfig
@@ -8,11 +8,11 @@
# CONFIG_NSH_ARGCAT is not set
# CONFIG_NSH_CMDOPT_HEXDUMP is not set
CONFIG_ARCH="risc-v"
-CONFIG_ARCH_BOARD="esp32h2-generic"
+CONFIG_ARCH_BOARD="esp32h2-devkit"
CONFIG_ARCH_BOARD_COMMON=y
-CONFIG_ARCH_BOARD_ESP32H2_GENERIC=y
-CONFIG_ARCH_CHIP="espressif"
-CONFIG_ARCH_CHIP_ESPRESSIF=y
+CONFIG_ARCH_BOARD_ESP32H2_DEVKIT=y
+CONFIG_ARCH_CHIP="esp32h2"
+CONFIG_ARCH_CHIP_ESP32H2=y
CONFIG_ARCH_INTERRUPTSTACK=2048
CONFIG_ARCH_RISCV=y
CONFIG_ARCH_STACKDUMP=y
diff --git a/boards/risc-v/espressif/esp32h2-generic/configs/rtc/defconfig
b/boards/risc-v/esp32h2/esp32h2-devkit/configs/rtc/defconfig
similarity index 90%
rename from boards/risc-v/espressif/esp32h2-generic/configs/rtc/defconfig
rename to boards/risc-v/esp32h2/esp32h2-devkit/configs/rtc/defconfig
index d168b1fbfa..286e3b26df 100644
--- a/boards/risc-v/espressif/esp32h2-generic/configs/rtc/defconfig
+++ b/boards/risc-v/esp32h2/esp32h2-devkit/configs/rtc/defconfig
@@ -8,11 +8,11 @@
# CONFIG_NSH_ARGCAT is not set
# CONFIG_NSH_CMDOPT_HEXDUMP is not set
CONFIG_ARCH="risc-v"
-CONFIG_ARCH_BOARD="esp32h2-generic"
+CONFIG_ARCH_BOARD="esp32h2-devkit"
CONFIG_ARCH_BOARD_COMMON=y
-CONFIG_ARCH_BOARD_ESP32H2_GENERIC=y
-CONFIG_ARCH_CHIP="espressif"
-CONFIG_ARCH_CHIP_ESPRESSIF=y
+CONFIG_ARCH_BOARD_ESP32H2_DEVKIT=y
+CONFIG_ARCH_CHIP="esp32h2"
+CONFIG_ARCH_CHIP_ESP32H2=y
CONFIG_ARCH_INTERRUPTSTACK=1536
CONFIG_ARCH_RISCV=y
CONFIG_ARCH_STACKDUMP=y
diff --git a/boards/risc-v/espressif/esp32h2-generic/configs/tickless/defconfig
b/boards/risc-v/esp32h2/esp32h2-devkit/configs/tickless/defconfig
similarity index 90%
rename from boards/risc-v/espressif/esp32h2-generic/configs/tickless/defconfig
rename to boards/risc-v/esp32h2/esp32h2-devkit/configs/tickless/defconfig
index 30d4497642..cfdffb2111 100644
--- a/boards/risc-v/espressif/esp32h2-generic/configs/tickless/defconfig
+++ b/boards/risc-v/esp32h2/esp32h2-devkit/configs/tickless/defconfig
@@ -8,11 +8,11 @@
# CONFIG_NSH_ARGCAT is not set
# CONFIG_NSH_CMDOPT_HEXDUMP is not set
CONFIG_ARCH="risc-v"
-CONFIG_ARCH_BOARD="esp32h2-generic"
+CONFIG_ARCH_BOARD="esp32h2-devkit"
CONFIG_ARCH_BOARD_COMMON=y
-CONFIG_ARCH_BOARD_ESP32H2_GENERIC=y
-CONFIG_ARCH_CHIP="espressif"
-CONFIG_ARCH_CHIP_ESPRESSIF=y
+CONFIG_ARCH_BOARD_ESP32H2_DEVKIT=y
+CONFIG_ARCH_CHIP="esp32h2"
+CONFIG_ARCH_CHIP_ESP32H2=y
CONFIG_ARCH_INTERRUPTSTACK=2048
CONFIG_ARCH_RISCV=y
CONFIG_ARCH_STACKDUMP=y
diff --git a/boards/risc-v/espressif/esp32h2-generic/configs/timers/defconfig
b/boards/risc-v/esp32h2/esp32h2-devkit/configs/timers/defconfig
similarity index 90%
rename from boards/risc-v/espressif/esp32h2-generic/configs/timers/defconfig
rename to boards/risc-v/esp32h2/esp32h2-devkit/configs/timers/defconfig
index afa1b573ca..2d8a356248 100644
--- a/boards/risc-v/espressif/esp32h2-generic/configs/timers/defconfig
+++ b/boards/risc-v/esp32h2/esp32h2-devkit/configs/timers/defconfig
@@ -8,11 +8,11 @@
# CONFIG_NSH_ARGCAT is not set
# CONFIG_NSH_CMDOPT_HEXDUMP is not set
CONFIG_ARCH="risc-v"
-CONFIG_ARCH_BOARD="esp32h2-generic"
+CONFIG_ARCH_BOARD="esp32h2-devkit"
CONFIG_ARCH_BOARD_COMMON=y
-CONFIG_ARCH_BOARD_ESP32H2_GENERIC=y
-CONFIG_ARCH_CHIP="espressif"
-CONFIG_ARCH_CHIP_ESPRESSIF=y
+CONFIG_ARCH_BOARD_ESP32H2_DEVKIT=y
+CONFIG_ARCH_CHIP="esp32h2"
+CONFIG_ARCH_CHIP_ESP32H2=y
CONFIG_ARCH_INTERRUPTSTACK=1536
CONFIG_ARCH_RISCV=y
CONFIG_ARCH_STACKDUMP=y
diff --git
a/boards/risc-v/espressif/esp32h2-generic/configs/usbconsole/defconfig
b/boards/risc-v/esp32h2/esp32h2-devkit/configs/usbconsole/defconfig
similarity index 90%
rename from boards/risc-v/espressif/esp32h2-generic/configs/usbconsole/defconfig
rename to boards/risc-v/esp32h2/esp32h2-devkit/configs/usbconsole/defconfig
index d71ce19a27..a000704805 100644
--- a/boards/risc-v/espressif/esp32h2-generic/configs/usbconsole/defconfig
+++ b/boards/risc-v/esp32h2/esp32h2-devkit/configs/usbconsole/defconfig
@@ -9,11 +9,11 @@
# CONFIG_NSH_ARGCAT is not set
# CONFIG_NSH_CMDOPT_HEXDUMP is not set
CONFIG_ARCH="risc-v"
-CONFIG_ARCH_BOARD="esp32h2-generic"
+CONFIG_ARCH_BOARD="esp32h2-devkit"
CONFIG_ARCH_BOARD_COMMON=y
-CONFIG_ARCH_BOARD_ESP32H2_GENERIC=y
-CONFIG_ARCH_CHIP="espressif"
-CONFIG_ARCH_CHIP_ESPRESSIF=y
+CONFIG_ARCH_BOARD_ESP32H2_DEVKIT=y
+CONFIG_ARCH_CHIP="esp32h2"
+CONFIG_ARCH_CHIP_ESP32H2=y
CONFIG_ARCH_INTERRUPTSTACK=2048
CONFIG_ARCH_RISCV=y
CONFIG_ARCH_STACKDUMP=y
diff --git a/boards/risc-v/espressif/esp32h2-generic/configs/watchdog/defconfig
b/boards/risc-v/esp32h2/esp32h2-devkit/configs/watchdog/defconfig
similarity index 90%
rename from boards/risc-v/espressif/esp32h2-generic/configs/watchdog/defconfig
rename to boards/risc-v/esp32h2/esp32h2-devkit/configs/watchdog/defconfig
index 5b11739414..891fe4c4fe 100644
--- a/boards/risc-v/espressif/esp32h2-generic/configs/watchdog/defconfig
+++ b/boards/risc-v/esp32h2/esp32h2-devkit/configs/watchdog/defconfig
@@ -8,11 +8,11 @@
# CONFIG_NSH_ARGCAT is not set
# CONFIG_NSH_CMDOPT_HEXDUMP is not set
CONFIG_ARCH="risc-v"
-CONFIG_ARCH_BOARD="esp32h2-generic"
+CONFIG_ARCH_BOARD="esp32h2-devkit"
CONFIG_ARCH_BOARD_COMMON=y
-CONFIG_ARCH_BOARD_ESP32H2_GENERIC=y
-CONFIG_ARCH_CHIP="espressif"
-CONFIG_ARCH_CHIP_ESPRESSIF=y
+CONFIG_ARCH_BOARD_ESP32H2_DEVKIT=y
+CONFIG_ARCH_CHIP="esp32h2"
+CONFIG_ARCH_CHIP_ESP32H2=y
CONFIG_ARCH_INTERRUPTSTACK=2048
CONFIG_ARCH_RISCV=y
CONFIG_ARCH_STACKDUMP=y
diff --git a/boards/risc-v/espressif/esp32h2-generic/include/board.h
b/boards/risc-v/esp32h2/esp32h2-devkit/include/board.h
similarity index 84%
rename from boards/risc-v/espressif/esp32h2-generic/include/board.h
rename to boards/risc-v/esp32h2/esp32h2-devkit/include/board.h
index 338340dd14..40d78d3ce9 100644
--- a/boards/risc-v/espressif/esp32h2-generic/include/board.h
+++ b/boards/risc-v/esp32h2/esp32h2-devkit/include/board.h
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/risc-v/espressif/esp32h2-generic/include/board.h
+ * boards/risc-v/esp32h2/esp32h2-devkit/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_ESPRESSIF_ESP32H2_GENERIC_INCLUDE_BOARD_H
-#define __BOARDS_RISCV_ESPRESSIF_ESP32H2_GENERIC_INCLUDE_BOARD_H
+#ifndef __BOARDS_RISCV_ESP32H2_ESP32H2_DEVKIT_INCLUDE_BOARD_H
+#define __BOARDS_RISCV_ESP32H2_ESP32H2_DEVKIT_INCLUDE_BOARD_H
/****************************************************************************
* Pre-processor Definitions
@@ -36,5 +36,5 @@
#define BUTTON_BOOT 9
-#endif /* __BOARDS_RISCV_ESPRESSIF_ESP32H2_GENERIC_INCLUDE_BOARD_H */
+#endif /* __BOARDS_RISCV_ESP32H2_ESP32H2_DEVKIT_INCLUDE_BOARD_H */
diff --git a/boards/risc-v/espressif/esp32h2-generic/scripts/Make.defs
b/boards/risc-v/esp32h2/esp32h2-devkit/scripts/Make.defs
similarity index 97%
rename from boards/risc-v/espressif/esp32h2-generic/scripts/Make.defs
rename to boards/risc-v/esp32h2/esp32h2-devkit/scripts/Make.defs
index 250aab7d1b..3b66ad64a0 100644
--- a/boards/risc-v/espressif/esp32h2-generic/scripts/Make.defs
+++ b/boards/risc-v/esp32h2/esp32h2-devkit/scripts/Make.defs
@@ -1,5 +1,5 @@
############################################################################
-# boards/risc-v/espressif/esp32h2-generic/scripts/Make.defs
+# boards/risc-v/esp32h2/esp32h2-generic/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/espressif/esp32h2-generic/src/Make.defs
b/boards/risc-v/esp32h2/esp32h2-devkit/src/Make.defs
similarity index 96%
rename from boards/risc-v/espressif/esp32h2-generic/src/Make.defs
rename to boards/risc-v/esp32h2/esp32h2-devkit/src/Make.defs
index 4267506a2e..48538c5362 100644
--- a/boards/risc-v/espressif/esp32h2-generic/src/Make.defs
+++ b/boards/risc-v/esp32h2/esp32h2-devkit/src/Make.defs
@@ -1,5 +1,5 @@
#############################################################################
-# boards/risc-v/espressif/esp32h2-generic/src/Make.defs
+# boards/risc-v/esp32h2/esp32h2-generic/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/espressif/esp32c6-generic/src/esp32c6-generic.h
b/boards/risc-v/esp32h2/esp32h2-devkit/src/esp32h2-devkit.h
similarity index 91%
rename from boards/risc-v/espressif/esp32c6-generic/src/esp32c6-generic.h
rename to boards/risc-v/esp32h2/esp32h2-devkit/src/esp32h2-devkit.h
index 0c7325e5c1..03fcbe1f1c 100644
--- a/boards/risc-v/espressif/esp32c6-generic/src/esp32c6-generic.h
+++ b/boards/risc-v/esp32h2/esp32h2-devkit/src/esp32h2-devkit.h
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/risc-v/espressif/esp32c6-generic/src/esp32c6-generic.h
+ * boards/risc-v/esp32h2/esp32h2-devkit/src/esp32h2-devkit.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_ESPRESSIF_ESP32C6_GENERIC_SRC_ESP32C6_GENERIC_H
-#define __BOARDS_RISCV_ESPRESSIF_ESP32C6_GENERIC_SRC_ESP32C6_GENERIC_H
+#ifndef __BOARDS_RISCV_ESP32H2_ESP32H2_DEVKIT_SRC_ESP32H2_DEVKIT_H
+#define __BOARDS_RISCV_ESP32H2_ESP32H2_DEVKIT_SRC_ESP32H2_DEVKIT_H
/****************************************************************************
* Included Files
@@ -84,4 +84,4 @@ int esp_gpio_init(void);
#endif
#endif /* __ASSEMBLY__ */
-#endif /* __BOARDS_RISCV_ESPRESSIF_ESP32C6_GENERIC_SRC_ESP32C6_GENERIC_H */
+#endif /* __BOARDS_RISCV_ESP32H2_ESP32H2_DEVKIT_SRC_ESP32H2_DEVKIT_H */
diff --git a/boards/risc-v/espressif/esp32h2-generic/src/esp32h2_appinit.c
b/boards/risc-v/esp32h2/esp32h2-devkit/src/esp32h2_appinit.c
similarity index 97%
rename from boards/risc-v/espressif/esp32h2-generic/src/esp32h2_appinit.c
rename to boards/risc-v/esp32h2/esp32h2-devkit/src/esp32h2_appinit.c
index 2070289f5d..e900efecdb 100644
--- a/boards/risc-v/espressif/esp32h2-generic/src/esp32h2_appinit.c
+++ b/boards/risc-v/esp32h2/esp32h2-devkit/src/esp32h2_appinit.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/risc-v/espressif/esp32h2-generic/src/esp32h2_appinit.c
+ * boards/risc-v/esp32h2/esp32h2-devkit/src/esp32h2_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 "esp32h2-generic.h"
+#include "esp32h2-devkit.h"
#ifdef CONFIG_BOARDCTL
diff --git a/boards/risc-v/espressif/esp32h2-generic/src/esp32h2_boot.c
b/boards/risc-v/esp32h2/esp32h2-devkit/src/esp32h2_boot.c
similarity index 98%
rename from boards/risc-v/espressif/esp32h2-generic/src/esp32h2_boot.c
rename to boards/risc-v/esp32h2/esp32h2-devkit/src/esp32h2_boot.c
index 76594281e5..fa1c5bae28 100644
--- a/boards/risc-v/espressif/esp32h2-generic/src/esp32h2_boot.c
+++ b/boards/risc-v/esp32h2/esp32h2-devkit/src/esp32h2_boot.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/risc-v/espressif/esp32h2-generic/src/esp32h2_boot.c
+ * boards/risc-v/esp32h2/esp32h2-devkit/src/esp32h2_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/espressif/esp32h2-generic/src/esp32h2_bringup.c
b/boards/risc-v/esp32h2/esp32h2-devkit/src/esp32h2_bringup.c
similarity index 98%
rename from boards/risc-v/espressif/esp32h2-generic/src/esp32h2_bringup.c
rename to boards/risc-v/esp32h2/esp32h2-devkit/src/esp32h2_bringup.c
index 7ea562a9a0..d597e8ba51 100644
--- a/boards/risc-v/espressif/esp32h2-generic/src/esp32h2_bringup.c
+++ b/boards/risc-v/esp32h2/esp32h2-devkit/src/esp32h2_bringup.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/risc-v/espressif/esp32h2-generic/src/esp32h2_bringup.c
+ * boards/risc-v/esp32h2/esp32h2-devkit/src/esp32h2_bringup.c
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -60,7 +60,7 @@
# include <nuttx/input/buttons.h>
#endif
-#include "esp32h2-generic.h"
+#include "esp32h2-devkit.h"
/****************************************************************************
* Pre-processor Definitions
diff --git a/boards/risc-v/espressif/esp32h2-generic/src/esp32h2_buttons.c
b/boards/risc-v/esp32h2/esp32h2-devkit/src/esp32h2_buttons.c
similarity index 98%
rename from boards/risc-v/espressif/esp32h2-generic/src/esp32h2_buttons.c
rename to boards/risc-v/esp32h2/esp32h2-devkit/src/esp32h2_buttons.c
index 958681cc65..78f0ebae0e 100644
--- a/boards/risc-v/espressif/esp32h2-generic/src/esp32h2_buttons.c
+++ b/boards/risc-v/esp32h2/esp32h2-devkit/src/esp32h2_buttons.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/risc-v/espressif/esp32h2-generic/src/esp32h2_buttons.c
+ * boards/risc-v/esp32h2/esp32h2-devkit/src/esp32h2_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 "esp32h2-generic.h"
+#include "esp32h2-devkit.h"
#include <arch/board/board.h>
/****************************************************************************
diff --git a/boards/risc-v/espressif/esp32h2-generic/src/esp32h2_gpio.c
b/boards/risc-v/esp32h2/esp32h2-devkit/src/esp32h2_gpio.c
similarity index 99%
rename from boards/risc-v/espressif/esp32h2-generic/src/esp32h2_gpio.c
rename to boards/risc-v/esp32h2/esp32h2-devkit/src/esp32h2_gpio.c
index d48d8a8b79..17cf6091cb 100644
--- a/boards/risc-v/espressif/esp32h2-generic/src/esp32h2_gpio.c
+++ b/boards/risc-v/esp32h2/esp32h2-devkit/src/esp32h2_gpio.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/risc-v/espressif/esp32h2-generic/src/esp32h2_gpio.c
+ * boards/risc-v/esp32h2/esp32h2-devkit/src/esp32h2_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 "esp32h2-generic.h"
+#include "esp32h2-devkit.h"
#include <arch/board/board.h>
/* HAL */
diff --git a/boards/risc-v/espressif/esp32h2-generic/src/esp32h2_reset.c
b/boards/risc-v/esp32h2/esp32h2-devkit/src/esp32h2_reset.c
similarity index 97%
rename from boards/risc-v/espressif/esp32h2-generic/src/esp32h2_reset.c
rename to boards/risc-v/esp32h2/esp32h2-devkit/src/esp32h2_reset.c
index 0520b578ac..77118e5d2e 100644
--- a/boards/risc-v/espressif/esp32h2-generic/src/esp32h2_reset.c
+++ b/boards/risc-v/esp32h2/esp32h2-devkit/src/esp32h2_reset.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/risc-v/espressif/esp32h2-generic/src/esp32h2_reset.c
+ * boards/risc-v/esp32h2/esp32h2-devkit/src/esp32h2_reset.c
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
