diff --git a/arch/risc-v/Kconfig b/arch/risc-v/Kconfig
index 256ed53b5bd..10274ceaca6 100644
--- a/arch/risc-v/Kconfig
+++ b/arch/risc-v/Kconfig
@@ -304,20 +304,20 @@ 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"	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 "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
 
 config ARCH_RISCV_INTXCPT_EXTENSIONS
 	bool "RISC-V Integer Context Extensions"
@@ -458,7 +458,7 @@ if ARCH_CHIP_BL602
 source "arch/risc-v/src/bl602/Kconfig"
 endif
 if ARCH_CHIP_ESP32C3
-source "arch/risc-v/src/esp32c3/Kconfig"
+source "arch/risc-v/src/esp32c3-legacy/Kconfig"
 endif
 if ARCH_CHIP_ESPRESSIF
 source "arch/risc-v/src/espressif/Kconfig"
diff --git a/arch/risc-v/include/esp32c3/chip.h b/arch/risc-v/include/esp32c3-legacy/chip.h
similarity index 87%
rename from arch/risc-v/include/esp32c3/chip.h
rename to arch/risc-v/include/esp32c3-legacy/chip.h
index cb640d57d3e..58a0a7f3a6c 100644
--- a/arch/risc-v/include/esp32c3/chip.h
+++ b/arch/risc-v/include/esp32c3-legacy/chip.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/include/esp32c3/chip.h
+ * arch/risc-v/include/esp32c3-legacy/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_ESP32C3_CHIP_H
-#define __ARCH_RISCV_INCLUDE_ESP32C3_CHIP_H
+#ifndef __ARCH_RISCV_INCLUDE_ESP32C3_LEGACY_CHIP_H
+#define __ARCH_RISCV_INCLUDE_ESP32C3_LEGACY_CHIP_H
 
 /****************************************************************************
  * Included Files
@@ -35,4 +35,4 @@
 
 #define ESP32C3_NGPIOS 22 /* GPIO0-21 */
 
-#endif /* __ARCH_RISCV_INCLUDE_ESP32C3_CHIP_H */
+#endif /* __ARCH_RISCV_INCLUDE_ESP32C3_LEGACY_CHIP_H */
diff --git a/arch/risc-v/include/esp32c3/esp_efuse_table.h b/arch/risc-v/include/esp32c3-legacy/esp_efuse_table.h
similarity index 99%
rename from arch/risc-v/include/esp32c3/esp_efuse_table.h
rename to arch/risc-v/include/esp32c3-legacy/esp_efuse_table.h
index a8a7d5d69e8..960f6876601 100644
--- a/arch/risc-v/include/esp32c3/esp_efuse_table.h
+++ b/arch/risc-v/include/esp32c3-legacy/esp_efuse_table.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/include/esp32c3/esp_efuse_table.h
+ * arch/risc-v/include/esp32c3-legacy/esp_efuse_table.h
  *
  * 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/include/esp32c3/irq.h b/arch/risc-v/include/esp32c3-legacy/irq.h
similarity index 99%
rename from arch/risc-v/include/esp32c3/irq.h
rename to arch/risc-v/include/esp32c3-legacy/irq.h
index b778f7859d2..c05200fb8be 100644
--- a/arch/risc-v/include/esp32c3/irq.h
+++ b/arch/risc-v/include/esp32c3-legacy/irq.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/include/esp32c3/irq.h
+ * arch/risc-v/include/esp32c3-legacy/irq.h
  *
  * 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/esp32c3/.gitignore b/arch/risc-v/src/esp32c3-legacy/.gitignore
similarity index 100%
rename from arch/risc-v/src/esp32c3/.gitignore
rename to arch/risc-v/src/esp32c3-legacy/.gitignore
diff --git a/arch/risc-v/src/esp32c3/Bootloader.mk b/arch/risc-v/src/esp32c3-legacy/Bootloader.mk
similarity index 99%
rename from arch/risc-v/src/esp32c3/Bootloader.mk
rename to arch/risc-v/src/esp32c3-legacy/Bootloader.mk
index bae150360e8..ac636e610d6 100644
--- a/arch/risc-v/src/esp32c3/Bootloader.mk
+++ b/arch/risc-v/src/esp32c3-legacy/Bootloader.mk
@@ -1,5 +1,5 @@
 ############################################################################
-# arch/risc-v/src/esp32c3/Bootloader.mk
+# arch/risc-v/src/esp32c3-legacy/Bootloader.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/esp32c3/Kconfig b/arch/risc-v/src/esp32c3-legacy/Kconfig
similarity index 99%
rename from arch/risc-v/src/esp32c3/Kconfig
rename to arch/risc-v/src/esp32c3-legacy/Kconfig
index abef7a8e82b..2e9bdae0b7e 100644
--- a/arch/risc-v/src/esp32c3/Kconfig
+++ b/arch/risc-v/src/esp32c3-legacy/Kconfig
@@ -1144,7 +1144,7 @@ config ESP32C3_USER_IMAGE_OFFSET
 
 endif
 
-source "arch/risc-v/src/esp32c3/Kconfig.security"
+source "arch/risc-v/src/esp32c3-legacy/Kconfig.security"
 
 endmenu # Application Image Configuration
 
diff --git a/arch/risc-v/src/esp32c3/Kconfig.security b/arch/risc-v/src/esp32c3-legacy/Kconfig.security
similarity index 100%
rename from arch/risc-v/src/esp32c3/Kconfig.security
rename to arch/risc-v/src/esp32c3-legacy/Kconfig.security
diff --git a/arch/risc-v/src/esp32c3/Make.defs b/arch/risc-v/src/esp32c3-legacy/Make.defs
similarity index 99%
rename from arch/risc-v/src/esp32c3/Make.defs
rename to arch/risc-v/src/esp32c3-legacy/Make.defs
index 80cd1691794..23ad159619f 100644
--- a/arch/risc-v/src/esp32c3/Make.defs
+++ b/arch/risc-v/src/esp32c3-legacy/Make.defs
@@ -1,5 +1,5 @@
 ############################################################################
-# arch/risc-v/src/esp32c3/Make.defs
+# arch/risc-v/src/esp32c3-legacy/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/arch/risc-v/src/esp32c3/chip.h b/arch/risc-v/src/esp32c3-legacy/chip.h
similarity index 97%
rename from arch/risc-v/src/esp32c3/chip.h
rename to arch/risc-v/src/esp32c3-legacy/chip.h
index 2ae947ddaea..d7eccc23f75 100644
--- a/arch/risc-v/src/esp32c3/chip.h
+++ b/arch/risc-v/src/esp32c3-legacy/chip.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/src/esp32c3/chip.h
+ * arch/risc-v/src/esp32c3-legacy/chip.h
  *
  * 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/esp32c3/esp32c3.h b/arch/risc-v/src/esp32c3-legacy/esp32c3.h
similarity index 89%
rename from arch/risc-v/src/esp32c3/esp32c3.h
rename to arch/risc-v/src/esp32c3-legacy/esp32c3.h
index af3c28dadb2..a332d20e708 100644
--- a/arch/risc-v/src/esp32c3/esp32c3.h
+++ b/arch/risc-v/src/esp32c3-legacy/esp32c3.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/src/esp32c3/esp32c3.h
+ * arch/risc-v/src/esp32c3-legacy/esp32c3.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_SRC_ESP32C3_ESP32C3_H
-#define __ARCH_RISCV_SRC_ESP32C3_ESP32C3_H
+#ifndef __ARCH_RISCV_SRC_ESP32C3_LEGACY_ESP32C3_H
+#define __ARCH_RISCV_SRC_ESP32C3_LEGACY_ESP32C3_H
 
 /****************************************************************************
  * Included Files
@@ -46,4 +46,4 @@
 
 #endif
 
-#endif /* __ARCH_RISCV_SRC_ESP32C3_ESP32C3_H */
+#endif /* __ARCH_RISCV_SRC_ESP32C3_LEGACY_ESP32C3_H */
diff --git a/arch/risc-v/src/esp32c3/esp32c3_adc.c b/arch/risc-v/src/esp32c3-legacy/esp32c3_adc.c
similarity index 99%
rename from arch/risc-v/src/esp32c3/esp32c3_adc.c
rename to arch/risc-v/src/esp32c3-legacy/esp32c3_adc.c
index 28837306bca..50f262f50d5 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_adc.c
+++ b/arch/risc-v/src/esp32c3-legacy/esp32c3_adc.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/src/esp32c3/esp32c3_adc.c
+ * arch/risc-v/src/esp32c3-legacy/esp32c3_adc.c
  *
  * 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/esp32c3/esp32c3_adc.h b/arch/risc-v/src/esp32c3-legacy/esp32c3_adc.h
similarity index 91%
rename from arch/risc-v/src/esp32c3/esp32c3_adc.h
rename to arch/risc-v/src/esp32c3-legacy/esp32c3_adc.h
index f79bf3f025d..a7577b34cc8 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_adc.h
+++ b/arch/risc-v/src/esp32c3-legacy/esp32c3_adc.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/src/esp32c3/esp32c3_adc.h
+ * arch/risc-v/src/esp32c3-legacy/esp32c3_adc.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_SRC_ESP32C3_ESP32C3_ADC_H
-#define __ARCH_RISCV_SRC_ESP32C3_ESP32C3_ADC_H
+#ifndef __ARCH_RISCV_SRC_ESP32C3_LEGACY_ESP32C3_ADC_H
+#define __ARCH_RISCV_SRC_ESP32C3_LEGACY_ESP32C3_ADC_H
 
 /****************************************************************************
  * Included Files
@@ -76,4 +76,4 @@ struct adc_dev_s *esp32c3_adc_init(int channel);
 #undef EXTERN
 
 #endif /* __ASSEMBLY__ */
-#endif /* __ARCH_RISCV_SRC_ESP32C3_ESP32C3_ADC_H */
+#endif /* __ARCH_RISCV_SRC_ESP32C3_LEGACY_ESP32C3_ADC_H */
diff --git a/arch/risc-v/src/esp32c3/esp32c3_aes.c b/arch/risc-v/src/esp32c3-legacy/esp32c3_aes.c
similarity index 99%
rename from arch/risc-v/src/esp32c3/esp32c3_aes.c
rename to arch/risc-v/src/esp32c3-legacy/esp32c3_aes.c
index 93e409a8af6..2eeddf0081e 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_aes.c
+++ b/arch/risc-v/src/esp32c3-legacy/esp32c3_aes.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/src/esp32c3/esp32c3_aes.c
+ * arch/risc-v/src/esp32c3-legacy/esp32c3_aes.c
  *
  * 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/esp32c3/esp32c3_aes.h b/arch/risc-v/src/esp32c3-legacy/esp32c3_aes.h
similarity index 96%
rename from arch/risc-v/src/esp32c3/esp32c3_aes.h
rename to arch/risc-v/src/esp32c3-legacy/esp32c3_aes.h
index 6ed25f17c07..e9061356967 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_aes.h
+++ b/arch/risc-v/src/esp32c3-legacy/esp32c3_aes.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/src/esp32c3/esp32c3_aes.h
+ * arch/risc-v/src/esp32c3-legacy/esp32c3_aes.h
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -22,8 +22,8 @@
  * Included Files
  ****************************************************************************/
 
-#ifndef __ARCH_RISCV_SRC_ESP32C3_ESP32C3_AES_H
-#define __ARCH_RISCV_SRC_ESP32C3_ESP32C3_AES_H
+#ifndef __ARCH_RISCV_SRC_ESP32C3_LEGACY_ESP32C3_AES_H
+#define __ARCH_RISCV_SRC_ESP32C3_LEGACY_ESP32C3_AES_H
 
 #include <nuttx/config.h>
 #include <stdint.h>
@@ -214,4 +214,4 @@ int esp32c3_aes_init(void);
 #undef EXTERN
 
 #endif /* __ASSEMBLY__ */
-#endif /* __ARCH_RISCV_SRC_ESP32C3_ESP32C3_AES_H */
+#endif /* __ARCH_RISCV_SRC_ESP32C3_LEGACY_ESP32C3_AES_H */
diff --git a/arch/risc-v/src/esp32c3/esp32c3_allocateheap.c b/arch/risc-v/src/esp32c3-legacy/esp32c3_allocateheap.c
similarity index 97%
rename from arch/risc-v/src/esp32c3/esp32c3_allocateheap.c
rename to arch/risc-v/src/esp32c3-legacy/esp32c3_allocateheap.c
index 6ede4bdec4d..2d33529c048 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_allocateheap.c
+++ b/arch/risc-v/src/esp32c3-legacy/esp32c3_allocateheap.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/src/esp32c3/esp32c3_allocateheap.c
+ * arch/risc-v/src/esp32c3-legacy/esp32c3_allocateheap.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -88,7 +88,7 @@ void up_allocate_heap(void **heap_start, size_t *heap_size)
 #else
   /* These values come from the linker scripts
    * (<legacy/mcuboot>_sections.ld and flat_memory.ld).
-   * Check boards/risc-v/esp32c3.
+   * Check boards/risc-v/esp32c3-legacy.
    */
 
   extern uint8_t _sheap[];
@@ -120,7 +120,7 @@ void up_allocate_kheap(void **heap_start, size_t *heap_size)
 {
   /* These values come from the linker scripts (kernel-space.ld and
    * protected_memory.ld).
-   * Check boards/risc-v/esp32c3.
+   * Check boards/risc-v/esp32c3-legacy.
    */
 
   extern uint8_t _sheap[];
diff --git a/arch/risc-v/src/esp32c3/esp32c3_attr.h b/arch/risc-v/src/esp32c3-legacy/esp32c3_attr.h
similarity index 88%
rename from arch/risc-v/src/esp32c3/esp32c3_attr.h
rename to arch/risc-v/src/esp32c3-legacy/esp32c3_attr.h
index e0c9818d07a..960d46ed05b 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_attr.h
+++ b/arch/risc-v/src/esp32c3-legacy/esp32c3_attr.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/src/esp32c3/esp32c3_attr.h
+ * arch/risc-v/src/esp32c3-legacy/esp32c3_attr.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_SRC_ESP32C3_ESP32C3_ATTR_H
-#define __ARCH_RISCV_SRC_ESP32C3_ESP32C3_ATTR_H
+#ifndef __ARCH_RISCV_SRC_ESP32C3_LEGACY_ESP32C3_ATTR_H
+#define __ARCH_RISCV_SRC_ESP32C3_LEGACY_ESP32C3_ATTR_H
 
 /****************************************************************************
  * Pre-processor Definitions
@@ -50,4 +50,4 @@
 
 #define RTC_RODATA_ATTR locate_data(".rtc.rodata")
 
-#endif /* __ARCH_RISCV_SRC_ESP32C3_ESP32C3_ATTR_H */
+#endif /* __ARCH_RISCV_SRC_ESP32C3_LEGACY_ESP32C3_ATTR_H */
diff --git a/arch/risc-v/src/esp32c3/esp32c3_bignum.c b/arch/risc-v/src/esp32c3-legacy/esp32c3_bignum.c
similarity index 99%
rename from arch/risc-v/src/esp32c3/esp32c3_bignum.c
rename to arch/risc-v/src/esp32c3-legacy/esp32c3_bignum.c
index a21b36fcb36..8477e182c99 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_bignum.c
+++ b/arch/risc-v/src/esp32c3-legacy/esp32c3_bignum.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/src/esp32c3/esp32c3_bignum.c
+ * arch/risc-v/src/esp32c3-legacy/esp32c3_bignum.c
  *
  * 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/esp32c3/esp32c3_bignum.h b/arch/risc-v/src/esp32c3-legacy/esp32c3_bignum.h
similarity index 99%
rename from arch/risc-v/src/esp32c3/esp32c3_bignum.h
rename to arch/risc-v/src/esp32c3-legacy/esp32c3_bignum.h
index 80d60430bbd..b8a5914b7bd 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_bignum.h
+++ b/arch/risc-v/src/esp32c3-legacy/esp32c3_bignum.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/src/esp32c3/esp32c3_bignum.h
+ * arch/risc-v/src/esp32c3-legacy/esp32c3_bignum.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_SRC_ESP32C3_ESP32C3_BIGNUM_H
-#define __ARCH_RISCV_SRC_ESP32C3_ESP32C3_BIGNUM_H
+#ifndef __ARCH_RISCV_SRC_ESP32C3_LEGACY_ESP32C3_BIGNUM_H
+#define __ARCH_RISCV_SRC_ESP32C3_LEGACY_ESP32C3_BIGNUM_H
 
 /****************************************************************************
  * Included Files
@@ -869,4 +869,4 @@ int esp32c3_mpi_inv_mod(struct esp32c3_mpi_s *X,
 #undef EXTERN
 
 #endif /* __ASSEMBLY__ */
-#endif /* __ARCH_RISCV_SRC_ESP32C3_ESP32C3_BIGNUM_H */
+#endif /* __ARCH_RISCV_SRC_ESP32C3_LEGACY_ESP32C3_BIGNUM_H */
diff --git a/arch/risc-v/src/esp32c3/esp32c3_ble.c b/arch/risc-v/src/esp32c3-legacy/esp32c3_ble.c
similarity index 99%
rename from arch/risc-v/src/esp32c3/esp32c3_ble.c
rename to arch/risc-v/src/esp32c3-legacy/esp32c3_ble.c
index 98b0d99c486..6c8f4bc2e61 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_ble.c
+++ b/arch/risc-v/src/esp32c3-legacy/esp32c3_ble.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/src/esp32c3/esp32c3_ble.c
+ * arch/risc-v/src/esp32c3-legacy/esp32c3_ble.c
  *
  * 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/esp32c3/esp32c3_ble.h b/arch/risc-v/src/esp32c3-legacy/esp32c3_ble.h
similarity index 88%
rename from arch/risc-v/src/esp32c3/esp32c3_ble.h
rename to arch/risc-v/src/esp32c3-legacy/esp32c3_ble.h
index d1cd2c9bd1e..ad5e5037521 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_ble.h
+++ b/arch/risc-v/src/esp32c3-legacy/esp32c3_ble.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/src/esp32c3/esp32c3_ble.h
+ * arch/risc-v/src/esp32c3-legacy/esp32c3_ble.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_SRC_ESP32C3_ESP32C3_BLE_H
-#define __ARCH_RISCV_SRC_ESP32C3_ESP32C3_BLE_H
+#ifndef __ARCH_RISCV_SRC_ESP32C3_LEGACY_ESP32C3_BLE_H
+#define __ARCH_RISCV_SRC_ESP32C3_LEGACY_ESP32C3_BLE_H
 
 /****************************************************************************
  * Included Files
@@ -47,4 +47,4 @@
 
 int esp32c3_ble_initialize(void);
 
-#endif /* __ARCH_RISCV_SRC_ESP32C3_ESP32C3_BLE_H */
+#endif /* __ARCH_RISCV_SRC_ESP32C3_LEGACY_ESP32C3_BLE_H */
diff --git a/arch/risc-v/src/esp32c3/esp32c3_ble_adapter.c b/arch/risc-v/src/esp32c3-legacy/esp32c3_ble_adapter.c
similarity index 99%
rename from arch/risc-v/src/esp32c3/esp32c3_ble_adapter.c
rename to arch/risc-v/src/esp32c3-legacy/esp32c3_ble_adapter.c
index 7bff497a0b4..44f20362f79 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_ble_adapter.c
+++ b/arch/risc-v/src/esp32c3-legacy/esp32c3_ble_adapter.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/src/esp32c3/esp32c3_ble_adapter.c
+ * arch/risc-v/src/esp32c3-legacy/esp32c3_ble_adapter.c
  *
  * 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/esp32c3/esp32c3_ble_adapter.h b/arch/risc-v/src/esp32c3-legacy/esp32c3_ble_adapter.h
similarity index 94%
rename from arch/risc-v/src/esp32c3/esp32c3_ble_adapter.h
rename to arch/risc-v/src/esp32c3-legacy/esp32c3_ble_adapter.h
index 70260356e95..d5898413cb2 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_ble_adapter.h
+++ b/arch/risc-v/src/esp32c3-legacy/esp32c3_ble_adapter.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/src/esp32c3/esp32c3_ble_adapter.h
+ * arch/risc-v/src/esp32c3-legacy/esp32c3_ble_adapter.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_SRC_ESP32C3_ESP32C3_BLE_ADAPTER_H
-#define __ARCH_RISCV_SRC_ESP32C3_ESP32C3_BLE_ADAPTER_H
+#ifndef __ARCH_RISCV_SRC_ESP32C3_LEGACY_ESP32C3_BLE_ADAPTER_H
+#define __ARCH_RISCV_SRC_ESP32C3_LEGACY_ESP32C3_BLE_ADAPTER_H
 
 /****************************************************************************
  * Included Files
@@ -158,4 +158,4 @@ void esp32c3_vhci_host_send_packet(uint8_t *data, uint16_t len);
 int esp32c3_vhci_register_callback(
                             const esp_vhci_host_callback_t *callback);
 
-#endif /* __ARCH_RISCV_SRC_ESP32C3_ESP32C3_BLE_ADAPTER_H */
+#endif /* __ARCH_RISCV_SRC_ESP32C3_LEGACY_ESP32C3_BLE_ADAPTER_H */
diff --git a/arch/risc-v/src/esp32c3/esp32c3_brownout.c b/arch/risc-v/src/esp32c3-legacy/esp32c3_brownout.c
similarity index 97%
rename from arch/risc-v/src/esp32c3/esp32c3_brownout.c
rename to arch/risc-v/src/esp32c3-legacy/esp32c3_brownout.c
index b0dcf9d10c0..3e1cd857c41 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_brownout.c
+++ b/arch/risc-v/src/esp32c3-legacy/esp32c3_brownout.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/src/esp32c3/esp32c3_brownout.c
+ * arch/risc-v/src/esp32c3-legacy/esp32c3_brownout.c
  *
  * 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/esp32c3/esp32c3_brownout.h b/arch/risc-v/src/esp32c3-legacy/esp32c3_brownout.h
similarity index 89%
rename from arch/risc-v/src/esp32c3/esp32c3_brownout.h
rename to arch/risc-v/src/esp32c3-legacy/esp32c3_brownout.h
index 1afb757247c..363416219a9 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_brownout.h
+++ b/arch/risc-v/src/esp32c3-legacy/esp32c3_brownout.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/src/esp32c3/esp32c3_brownout.h
+ * arch/risc-v/src/esp32c3-legacy/esp32c3_brownout.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_SRC_ESP32C3_ESP32C3_BROWNOUT_H
-#define __ARCH_RISCV_SRC_ESP32C3_ESP32C3_BROWNOUT_H
+#ifndef __ARCH_RISCV_SRC_ESP32C3_LEGACY_ESP32C3_BROWNOUT_H
+#define __ARCH_RISCV_SRC_ESP32C3_LEGACY_ESP32C3_BROWNOUT_H
 
 /****************************************************************************
  * Included Files
@@ -62,4 +62,4 @@ void esp32c3_brownout_init(void);
 
 #endif /* __ASSEMBLY__ */
 
-#endif /* __ARCH_RISCV_SRC_ESP32C3_ESP32C3_BROWNOUT_H */
+#endif /* __ARCH_RISCV_SRC_ESP32C3_LEGACY_ESP32C3_BROWNOUT_H */
diff --git a/arch/risc-v/src/esp32c3/esp32c3_clockconfig.c b/arch/risc-v/src/esp32c3-legacy/esp32c3_clockconfig.c
similarity index 99%
rename from arch/risc-v/src/esp32c3/esp32c3_clockconfig.c
rename to arch/risc-v/src/esp32c3-legacy/esp32c3_clockconfig.c
index c68703d458e..11361f0ae06 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_clockconfig.c
+++ b/arch/risc-v/src/esp32c3-legacy/esp32c3_clockconfig.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/src/esp32c3/esp32c3_clockconfig.c
+ * arch/risc-v/src/esp32c3-legacy/esp32c3_clockconfig.c
  *
  * 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/esp32c3/esp32c3_clockconfig.h b/arch/risc-v/src/esp32c3-legacy/esp32c3_clockconfig.h
similarity index 92%
rename from arch/risc-v/src/esp32c3/esp32c3_clockconfig.h
rename to arch/risc-v/src/esp32c3-legacy/esp32c3_clockconfig.h
index 297a95ad964..d5262caaef5 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_clockconfig.h
+++ b/arch/risc-v/src/esp32c3-legacy/esp32c3_clockconfig.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/src/esp32c3/esp32c3_clockconfig.h
+ * arch/risc-v/src/esp32c3-legacy/esp32c3_clockconfig.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_SRC_ESP32C3_ESP32C3_CLOCKCONFIG_H
-#define __ARCH_RISCV_SRC_ESP32C3_ESP32C3_CLOCKCONFIG_H
+#ifndef __ARCH_RISCV_SRC_ESP32C3_LEGACY_ESP32C3_CLOCKCONFIG_H
+#define __ARCH_RISCV_SRC_ESP32C3_LEGACY_ESP32C3_CLOCKCONFIG_H
 
 /****************************************************************************
  * Included Files
@@ -101,4 +101,4 @@ uint32_t IRAM_ATTR esp32c3_cpu_cycle_count(void);
 
 #endif /* __ASSEMBLY__ */
 
-#endif /* __ARCH_RISCV_SRC_ESP32C3_ESP32C3_CLOCKCONFIG_H */
+#endif /* __ARCH_RISCV_SRC_ESP32C3_LEGACY_ESP32C3_CLOCKCONFIG_H */
diff --git a/arch/risc-v/src/esp32c3/esp32c3_config.h b/arch/risc-v/src/esp32c3-legacy/esp32c3_config.h
similarity index 91%
rename from arch/risc-v/src/esp32c3/esp32c3_config.h
rename to arch/risc-v/src/esp32c3-legacy/esp32c3_config.h
index 0c520a4d381..c5057107cdb 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_config.h
+++ b/arch/risc-v/src/esp32c3-legacy/esp32c3_config.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/src/esp32c3/esp32c3_config.h
+ * arch/risc-v/src/esp32c3-legacy/esp32c3_config.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_SRC_ESP32C3_ESP32C3_CONFIG_H
-#define __ARCH_RISCV_SRC_ESP32C3_ESP32C3_CONFIG_H
+#ifndef __ARCH_RISCV_SRC_ESP32C3_LEGACY_ESP32C3_CONFIG_H
+#define __ARCH_RISCV_SRC_ESP32C3_LEGACY_ESP32C3_CONFIG_H
 
 /****************************************************************************
  * Included Files
@@ -68,4 +68,4 @@
 #  define HAVE_UART_DEVICE 1
 #endif
 
-#endif /* __ARCH_RISCV_SRC_ESP32C3_ESP32C3_CONFIG_H */
+#endif /* __ARCH_RISCV_SRC_ESP32C3_LEGACY_ESP32C3_CONFIG_H */
diff --git a/arch/risc-v/src/esp32c3/esp32c3_crypto.c b/arch/risc-v/src/esp32c3-legacy/esp32c3_crypto.c
similarity index 99%
rename from arch/risc-v/src/esp32c3/esp32c3_crypto.c
rename to arch/risc-v/src/esp32c3-legacy/esp32c3_crypto.c
index de170596df3..76cb1d0a939 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_crypto.c
+++ b/arch/risc-v/src/esp32c3-legacy/esp32c3_crypto.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/src/esp32c3/esp32c3_crypto.c
+ * arch/risc-v/src/esp32c3-legacy/esp32c3_crypto.c
  *
  * 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/esp32c3/esp32c3_dma.c b/arch/risc-v/src/esp32c3-legacy/esp32c3_dma.c
similarity index 99%
rename from arch/risc-v/src/esp32c3/esp32c3_dma.c
rename to arch/risc-v/src/esp32c3-legacy/esp32c3_dma.c
index 88d21f300ae..198328e82dc 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_dma.c
+++ b/arch/risc-v/src/esp32c3-legacy/esp32c3_dma.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/src/esp32c3/esp32c3_dma.c
+ * arch/risc-v/src/esp32c3-legacy/esp32c3_dma.c
  *
  * 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/esp32c3/esp32c3_dma.h b/arch/risc-v/src/esp32c3-legacy/esp32c3_dma.h
similarity index 96%
rename from arch/risc-v/src/esp32c3/esp32c3_dma.h
rename to arch/risc-v/src/esp32c3-legacy/esp32c3_dma.h
index 17272a9b379..c0d4d9d59d7 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_dma.h
+++ b/arch/risc-v/src/esp32c3-legacy/esp32c3_dma.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/src/esp32c3/esp32c3_dma.h
+ * arch/risc-v/src/esp32c3-legacy/esp32c3_dma.h
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -22,8 +22,8 @@
  * Included Files
  ****************************************************************************/
 
-#ifndef __ARCH_RISCV_SRC_ESP32C3_ESP32C3_DMA_H
-#define __ARCH_RISCV_SRC_ESP32C3_ESP32C3_DMA_H
+#ifndef __ARCH_RISCV_SRC_ESP32C3_LEGACY_ESP32C3_DMA_H
+#define __ARCH_RISCV_SRC_ESP32C3_LEGACY_ESP32C3_DMA_H
 
 #include <nuttx/config.h>
 #include <stdbool.h>
@@ -222,4 +222,4 @@ void esp32c3_dma_init(void);
 #undef EXTERN
 
 #endif /* __ASSEMBLY__ */
-#endif /* __ARCH_RISCV_SRC_ESP32C3_ESP32C3_DMA_H */
+#endif /* __ARCH_RISCV_SRC_ESP32C3_LEGACY_ESP32C3_DMA_H */
diff --git a/arch/risc-v/src/esp32c3/esp32c3_efuse.c b/arch/risc-v/src/esp32c3-legacy/esp32c3_efuse.c
similarity index 99%
rename from arch/risc-v/src/esp32c3/esp32c3_efuse.c
rename to arch/risc-v/src/esp32c3-legacy/esp32c3_efuse.c
index 79edcf7e297..fc23911c9d6 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_efuse.c
+++ b/arch/risc-v/src/esp32c3-legacy/esp32c3_efuse.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/src/esp32c3/esp32c3_efuse.c
+ * arch/risc-v/src/esp32c3-legacy/esp32c3_efuse.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 <string.h>
 #include <sys/param.h>
 #include <nuttx/efuse/efuse.h>
-#include <arch/esp32c3/chip.h>
+#include <arch/esp32c3-legacy/chip.h>
 
 #include "riscv_internal.h"
 #include "hardware/esp32c3_soc.h"
diff --git a/arch/risc-v/src/esp32c3/esp32c3_efuse.h b/arch/risc-v/src/esp32c3-legacy/esp32c3_efuse.h
similarity index 96%
rename from arch/risc-v/src/esp32c3/esp32c3_efuse.h
rename to arch/risc-v/src/esp32c3-legacy/esp32c3_efuse.h
index f97b690a1e1..c3d6b856565 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_efuse.h
+++ b/arch/risc-v/src/esp32c3-legacy/esp32c3_efuse.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/src/esp32c3/esp32c3_efuse.h
+ * arch/risc-v/src/esp32c3-legacy/esp32c3_efuse.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_SRC_ESP32C3_ESP32C3_EFUSE_H
-#define __ARCH_RISCV_SRC_ESP32C3_ESP32C3_EFUSE_H
+#ifndef __ARCH_RISCV_SRC_ESP32C3_LEGACY_ESP32C3_EFUSE_H
+#define __ARCH_RISCV_SRC_ESP32C3_LEGACY_ESP32C3_EFUSE_H
 
 /****************************************************************************
  * Included Files
@@ -186,4 +186,4 @@ int esp32c3_efuse_initialize(const char *devpath);
 #undef EXTERN
 
 #endif /* __ASSEMBLY__ */
-#endif /* __ARCH_RISCV_SRC_ESP32C3_ESP32C3_EFUSE_H */
+#endif /* __ARCH_RISCV_SRC_ESP32C3_LEGACY_ESP32C3_EFUSE_H */
diff --git a/arch/risc-v/src/esp32c3/esp32c3_efuse_lowerhalf.c b/arch/risc-v/src/esp32c3-legacy/esp32c3_efuse_lowerhalf.c
similarity index 99%
rename from arch/risc-v/src/esp32c3/esp32c3_efuse_lowerhalf.c
rename to arch/risc-v/src/esp32c3-legacy/esp32c3_efuse_lowerhalf.c
index e1d15d46fa5..0364e260d32 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_efuse_lowerhalf.c
+++ b/arch/risc-v/src/esp32c3-legacy/esp32c3_efuse_lowerhalf.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/src/esp32c3/esp32c3_efuse_lowerhalf.c
+ * arch/risc-v/src/esp32c3-legacy/esp32c3_efuse_lowerhalf.c
  *
  * 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/esp32c3/esp32c3_efuse_table.c b/arch/risc-v/src/esp32c3-legacy/esp32c3_efuse_table.c
similarity index 99%
rename from arch/risc-v/src/esp32c3/esp32c3_efuse_table.c
rename to arch/risc-v/src/esp32c3-legacy/esp32c3_efuse_table.c
index 9eaeef685c1..98a0dba3489 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_efuse_table.c
+++ b/arch/risc-v/src/esp32c3-legacy/esp32c3_efuse_table.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/src/esp32c3/esp32c3_efuse_table.c
+ * arch/risc-v/src/esp32c3-legacy/esp32c3_efuse_table.c
  *
  * 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/esp32c3/esp32c3_extraheaps.c b/arch/risc-v/src/esp32c3-legacy/esp32c3_extraheaps.c
similarity index 97%
rename from arch/risc-v/src/esp32c3/esp32c3_extraheaps.c
rename to arch/risc-v/src/esp32c3-legacy/esp32c3_extraheaps.c
index beb6b96fa6a..4a10b735fcb 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_extraheaps.c
+++ b/arch/risc-v/src/esp32c3-legacy/esp32c3_extraheaps.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/src/esp32c3/esp32c3_extraheaps.c
+ * arch/risc-v/src/esp32c3-legacy/esp32c3_extraheaps.c
  *
  * 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/esp32c3/esp32c3_freerun.c b/arch/risc-v/src/esp32c3-legacy/esp32c3_freerun.c
similarity index 99%
rename from arch/risc-v/src/esp32c3/esp32c3_freerun.c
rename to arch/risc-v/src/esp32c3-legacy/esp32c3_freerun.c
index 85017ff4643..4cc1b4d749b 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_freerun.c
+++ b/arch/risc-v/src/esp32c3-legacy/esp32c3_freerun.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/src/esp32c3/esp32c3_freerun.c
+ * arch/risc-v/src/esp32c3-legacy/esp32c3_freerun.c
  *
  * 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/esp32c3/esp32c3_freerun.h b/arch/risc-v/src/esp32c3-legacy/esp32c3_freerun.h
similarity index 95%
rename from arch/risc-v/src/esp32c3/esp32c3_freerun.h
rename to arch/risc-v/src/esp32c3-legacy/esp32c3_freerun.h
index d9842146cc1..cc47c469a79 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_freerun.h
+++ b/arch/risc-v/src/esp32c3-legacy/esp32c3_freerun.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/src/esp32c3/esp32c3_freerun.h
+ * arch/risc-v/src/esp32c3-legacy/esp32c3_freerun.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_SRC_ESP32C3_ESP32C3_FREERUN_H
-#define __ARCH_RISCV_SRC_ESP32C3_ESP32C3_FREERUN_H
+#ifndef __ARCH_RISCV_SRC_ESP32C3_LEGACY_ESP32C3_FREERUN_H
+#define __ARCH_RISCV_SRC_ESP32C3_LEGACY_ESP32C3_FREERUN_H
 
 /****************************************************************************
  * Included Files
@@ -142,4 +142,4 @@ int esp32c3_freerun_uninitialize(struct esp32c3_freerun_s *freerun);
 #endif
 
 #endif /* CONFIG_ESP32C3_FREERUN */
-#endif /* __ARCH_RISCV_SRC_ESP32C3_ESP32C3_FREERUN_H */
+#endif /* __ARCH_RISCV_SRC_ESP32C3_LEGACY_ESP32C3_FREERUN_H */
diff --git a/arch/risc-v/src/esp32c3/esp32c3_gpio.c b/arch/risc-v/src/esp32c3-legacy/esp32c3_gpio.c
similarity index 99%
rename from arch/risc-v/src/esp32c3/esp32c3_gpio.c
rename to arch/risc-v/src/esp32c3-legacy/esp32c3_gpio.c
index abda9e09000..6fc1d056292 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_gpio.c
+++ b/arch/risc-v/src/esp32c3-legacy/esp32c3_gpio.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/src/esp32c3/esp32c3_gpio.c
+ * arch/risc-v/src/esp32c3-legacy/esp32c3_gpio.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -32,7 +32,7 @@
 #include <nuttx/arch.h>
 #include <nuttx/irq.h>
 #include <arch/irq.h>
-#include <arch/esp32c3/chip.h>
+#include <arch/esp32c3-legacy/chip.h>
 
 #include "riscv_internal.h"
 #ifdef CONFIG_ESP32C3_GPIO_IRQ
diff --git a/arch/risc-v/src/esp32c3/esp32c3_gpio.h b/arch/risc-v/src/esp32c3-legacy/esp32c3_gpio.h
similarity index 97%
rename from arch/risc-v/src/esp32c3/esp32c3_gpio.h
rename to arch/risc-v/src/esp32c3-legacy/esp32c3_gpio.h
index ba32098b131..dc99f0a6911 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_gpio.h
+++ b/arch/risc-v/src/esp32c3-legacy/esp32c3_gpio.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/src/esp32c3/esp32c3_gpio.h
+ * arch/risc-v/src/esp32c3-legacy/esp32c3_gpio.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_SRC_ESP32C3_ESP32C3_GPIO_H
-#define __ARCH_RISCV_SRC_ESP32C3_ESP32C3_GPIO_H
+#ifndef __ARCH_RISCV_SRC_ESP32C3_LEGACY_ESP32C3_GPIO_H
+#define __ARCH_RISCV_SRC_ESP32C3_LEGACY_ESP32C3_GPIO_H
 
 /****************************************************************************
  * Included Files
@@ -222,4 +222,4 @@ void esp32c3_gpioirqdisable(int irq);
 #undef EXTERN
 
 #endif /* __ASSEMBLY__ */
-#endif /* __ARCH_RISCV_SRC_ESP32C3_ESP32C3_GPIO_H */
+#endif /* __ARCH_RISCV_SRC_ESP32C3_LEGACY_ESP32C3_GPIO_H */
diff --git a/arch/risc-v/src/esp32c3/esp32c3_head.S b/arch/risc-v/src/esp32c3-legacy/esp32c3_head.S
similarity index 97%
rename from arch/risc-v/src/esp32c3/esp32c3_head.S
rename to arch/risc-v/src/esp32c3-legacy/esp32c3_head.S
index 457df34ab44..551900022cc 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_head.S
+++ b/arch/risc-v/src/esp32c3-legacy/esp32c3_head.S
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/src/esp32c3/esp32c3_head.S
+ * arch/risc-v/src/esp32c3-legacy/esp32c3_head.S
  *
  * 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/esp32c3/esp32c3_i2c.c b/arch/risc-v/src/esp32c3-legacy/esp32c3_i2c.c
similarity index 99%
rename from arch/risc-v/src/esp32c3/esp32c3_i2c.c
rename to arch/risc-v/src/esp32c3-legacy/esp32c3_i2c.c
index 49e6931da61..9c098dfd2ad 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_i2c.c
+++ b/arch/risc-v/src/esp32c3-legacy/esp32c3_i2c.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/src/esp32c3/esp32c3_i2c.c
+ * arch/risc-v/src/esp32c3-legacy/esp32c3_i2c.c
  *
  * 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/esp32c3/esp32c3_i2c.h b/arch/risc-v/src/esp32c3-legacy/esp32c3_i2c.h
similarity index 93%
rename from arch/risc-v/src/esp32c3/esp32c3_i2c.h
rename to arch/risc-v/src/esp32c3-legacy/esp32c3_i2c.h
index 115e7d0d135..9b096dbb7f1 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_i2c.h
+++ b/arch/risc-v/src/esp32c3-legacy/esp32c3_i2c.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/src/esp32c3/esp32c3_i2c.h
+ * arch/risc-v/src/esp32c3-legacy/esp32c3_i2c.h
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -22,8 +22,8 @@
  * Included Files
  ****************************************************************************/
 
-#ifndef __ARCH_RISCV_SRC_ESP32C3_ESP32C3_I2C_H
-#define __ARCH_RISCV_SRC_ESP32C3_ESP32C3_I2C_H
+#ifndef __ARCH_RISCV_SRC_ESP32C3_LEGACY_ESP32C3_I2C_H
+#define __ARCH_RISCV_SRC_ESP32C3_LEGACY_ESP32C3_I2C_H
 
 /****************************************************************************
  * Included Files
@@ -91,4 +91,4 @@ int esp32c3_i2cbus_uninitialize(struct i2c_master_s *dev);
 #undef EXTERN
 
 #endif /* __ASSEMBLY__ */
-#endif /* __ARCH_RISCV_SRC_ESP32C3_ESP32C3_I2C_H */
+#endif /* __ARCH_RISCV_SRC_ESP32C3_LEGACY_ESP32C3_I2C_H */
diff --git a/arch/risc-v/src/esp32c3/esp32c3_idle.c b/arch/risc-v/src/esp32c3-legacy/esp32c3_idle.c
similarity index 99%
rename from arch/risc-v/src/esp32c3/esp32c3_idle.c
rename to arch/risc-v/src/esp32c3-legacy/esp32c3_idle.c
index b78bf303994..5b4e406c30b 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_idle.c
+++ b/arch/risc-v/src/esp32c3-legacy/esp32c3_idle.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/src/esp32c3/esp32c3_idle.c
+ * arch/risc-v/src/esp32c3-legacy/esp32c3_idle.c
  *
  * 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/esp32c3/esp32c3_irq.c b/arch/risc-v/src/esp32c3-legacy/esp32c3_irq.c
similarity index 99%
rename from arch/risc-v/src/esp32c3/esp32c3_irq.c
rename to arch/risc-v/src/esp32c3-legacy/esp32c3_irq.c
index 888f6b35fb4..1c98bf5931f 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_irq.c
+++ b/arch/risc-v/src/esp32c3-legacy/esp32c3_irq.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/src/esp32c3/esp32c3_irq.c
+ * arch/risc-v/src/esp32c3-legacy/esp32c3_irq.c
  *
  * 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/esp32c3/esp32c3_irq.h b/arch/risc-v/src/esp32c3-legacy/esp32c3_irq.h
similarity index 95%
rename from arch/risc-v/src/esp32c3/esp32c3_irq.h
rename to arch/risc-v/src/esp32c3-legacy/esp32c3_irq.h
index 3c31367ecc7..2e38073d3ae 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_irq.h
+++ b/arch/risc-v/src/esp32c3-legacy/esp32c3_irq.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/src/esp32c3/esp32c3_irq.h
+ * arch/risc-v/src/esp32c3-legacy/esp32c3_irq.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_SRC_ESP32C3_ESP32C3_IRQ_H
-#define __ARCH_RISCV_SRC_ESP32C3_ESP32C3_IRQ_H
+#ifndef __ARCH_RISCV_SRC_ESP32C3_LEGACY_ESP32C3_IRQ_H
+#define __ARCH_RISCV_SRC_ESP32C3_LEGACY_ESP32C3_IRQ_H
 
 /****************************************************************************
  * Included Files
@@ -143,4 +143,4 @@ void esp32c3_teardown_irq(int periphid, int cpuint);
 #endif
 
 #endif /* __ASSEMBLY__ */
-#endif /* __ARCH_RISCV_SRC_ESP32C3_ESP32C3_IRQ_H */
+#endif /* __ARCH_RISCV_SRC_ESP32C3_LEGACY_ESP32C3_IRQ_H */
diff --git a/arch/risc-v/src/esp32c3/esp32c3_ledc.c b/arch/risc-v/src/esp32c3-legacy/esp32c3_ledc.c
similarity index 99%
rename from arch/risc-v/src/esp32c3/esp32c3_ledc.c
rename to arch/risc-v/src/esp32c3-legacy/esp32c3_ledc.c
index 74011eb820f..abaa3e68911 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_ledc.c
+++ b/arch/risc-v/src/esp32c3-legacy/esp32c3_ledc.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/src/esp32c3/esp32c3_ledc.c
+ * arch/risc-v/src/esp32c3-legacy/esp32c3_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/arch/risc-v/src/esp32c3/esp32c3_ledc.h b/arch/risc-v/src/esp32c3-legacy/esp32c3_ledc.h
similarity index 89%
rename from arch/risc-v/src/esp32c3/esp32c3_ledc.h
rename to arch/risc-v/src/esp32c3-legacy/esp32c3_ledc.h
index 73ece77f671..0046a22a8f7 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_ledc.h
+++ b/arch/risc-v/src/esp32c3-legacy/esp32c3_ledc.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/src/esp32c3/esp32c3_ledc.h
+ * arch/risc-v/src/esp32c3-legacy/esp32c3_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 __ARCH_RISCV_SRC_ESP32C3_ESP32C3_LEDC_H
-#define __ARCH_RISCV_SRC_ESP32C3_ESP32C3_LEDC_H
+#ifndef __ARCH_RISCV_SRC_ESP32C3_LEGACY_ESP32C3_LEDC_H
+#define __ARCH_RISCV_SRC_ESP32C3_LEGACY_ESP32C3_LEDC_H
 
 /****************************************************************************
  * Included Files
@@ -49,4 +49,4 @@
 
 struct pwm_lowerhalf_s *esp32c3_ledc_init(int timer);
 
-#endif /* __ARCH_RISCV_SRC_ESP32C3_ESP32C3_LEDC_H */
+#endif /* __ARCH_RISCV_SRC_ESP32C3_LEGACY_ESP32C3_LEDC_H */
diff --git a/arch/risc-v/src/esp32c3/esp32c3_libc_stubs.c b/arch/risc-v/src/esp32c3-legacy/esp32c3_libc_stubs.c
similarity index 99%
rename from arch/risc-v/src/esp32c3/esp32c3_libc_stubs.c
rename to arch/risc-v/src/esp32c3-legacy/esp32c3_libc_stubs.c
index a3f0901f8e6..0bd7866bbc4 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_libc_stubs.c
+++ b/arch/risc-v/src/esp32c3-legacy/esp32c3_libc_stubs.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/src/esp32c3/esp32c3_libc_stubs.c
+ * arch/risc-v/src/esp32c3-legacy/esp32c3_libc_stubs.c
  *
  * 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/esp32c3/esp32c3_lowputc.c b/arch/risc-v/src/esp32c3-legacy/esp32c3_lowputc.c
similarity index 99%
rename from arch/risc-v/src/esp32c3/esp32c3_lowputc.c
rename to arch/risc-v/src/esp32c3-legacy/esp32c3_lowputc.c
index 5fc1d6a5461..2afa7e3f4cf 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_lowputc.c
+++ b/arch/risc-v/src/esp32c3-legacy/esp32c3_lowputc.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/src/esp32c3/esp32c3_lowputc.c
+ * arch/risc-v/src/esp32c3-legacy/esp32c3_lowputc.c
  *
  * 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/esp32c3/esp32c3_lowputc.h b/arch/risc-v/src/esp32c3-legacy/esp32c3_lowputc.h
similarity index 98%
rename from arch/risc-v/src/esp32c3/esp32c3_lowputc.h
rename to arch/risc-v/src/esp32c3-legacy/esp32c3_lowputc.h
index ac0f58b1c16..232e46664b2 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_lowputc.h
+++ b/arch/risc-v/src/esp32c3-legacy/esp32c3_lowputc.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/src/esp32c3/esp32c3_lowputc.h
+ * arch/risc-v/src/esp32c3-legacy/esp32c3_lowputc.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_SRC_ESP32C3_ESP32C3_LOWPUTC_H
-#define __ARCH_RISCV_SRC_ESP32C3_ESP32C3_LOWPUTC_H
+#ifndef __ARCH_RISCV_SRC_ESP32C3_LEGACY_ESP32C3_LOWPUTC_H
+#define __ARCH_RISCV_SRC_ESP32C3_LEGACY_ESP32C3_LOWPUTC_H
 
 /****************************************************************************
  * Included Files
@@ -489,4 +489,4 @@ void esp32c3_lowputc_restore_pins(const struct esp32c3_uart_s *priv);
 
 void esp32c3_lowsetup(void);
 
-#endif /* __ARCH_RISCV_SRC_ESP32C3_ESP32C3_LOWPUTC_H */
+#endif /* __ARCH_RISCV_SRC_ESP32C3_LEGACY_ESP32C3_LOWPUTC_H */
diff --git a/arch/risc-v/src/esp32c3/esp32c3_memorymap.h b/arch/risc-v/src/esp32c3-legacy/esp32c3_memorymap.h
similarity index 86%
rename from arch/risc-v/src/esp32c3/esp32c3_memorymap.h
rename to arch/risc-v/src/esp32c3-legacy/esp32c3_memorymap.h
index 1323d960aca..59fa8b5e963 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_memorymap.h
+++ b/arch/risc-v/src/esp32c3-legacy/esp32c3_memorymap.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/src/esp32c3/esp32c3_memorymap.h
+ * arch/risc-v/src/esp32c3-legacy/esp32c3_memorymap.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_SRC_ESP32C3_ESP32C3_MEMORYMAP_H
-#define __ARCH_RISCV_SRC_ESP32C3_ESP32C3_MEMORYMAP_H
+#ifndef __ARCH_RISCV_SRC_ESP32C3_LEGACY_ESP32C3_MEMORYMAP_H
+#define __ARCH_RISCV_SRC_ESP32C3_LEGACY_ESP32C3_MEMORYMAP_H
 
 /****************************************************************************
  * Included Files
@@ -39,4 +39,4 @@
 
 #define ESP32C3_IDLESTACK_TOP  (ESP32C3_IDLESTACK_BASE + CONFIG_IDLETHREAD_STACKSIZE)
 
-#endif /* __ARCH_RISCV_SRC_ESP32C3_ESP32C3_MEMORYMAP_H */
+#endif /* __ARCH_RISCV_SRC_ESP32C3_LEGACY_ESP32C3_MEMORYMAP_H */
diff --git a/arch/risc-v/src/esp32c3/esp32c3_oneshot.c b/arch/risc-v/src/esp32c3-legacy/esp32c3_oneshot.c
similarity index 99%
rename from arch/risc-v/src/esp32c3/esp32c3_oneshot.c
rename to arch/risc-v/src/esp32c3-legacy/esp32c3_oneshot.c
index 25fdc13133f..a499d42ae9e 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_oneshot.c
+++ b/arch/risc-v/src/esp32c3-legacy/esp32c3_oneshot.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/src/esp32c3/esp32c3_oneshot.c
+ * arch/risc-v/src/esp32c3-legacy/esp32c3_oneshot.c
  *
  * 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/esp32c3/esp32c3_oneshot.h b/arch/risc-v/src/esp32c3-legacy/esp32c3_oneshot.h
similarity index 97%
rename from arch/risc-v/src/esp32c3/esp32c3_oneshot.h
rename to arch/risc-v/src/esp32c3-legacy/esp32c3_oneshot.h
index 3d5fe839ca8..6bba13c0575 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_oneshot.h
+++ b/arch/risc-v/src/esp32c3-legacy/esp32c3_oneshot.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/src/esp32c3/esp32c3_oneshot.h
+ * arch/risc-v/src/esp32c3-legacy/esp32c3_oneshot.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_SRC_ESP32C3_ONESHOT_H
-#define __ARCH_RISCV_SRC_ESP32C3_ONESHOT_H
+#ifndef __ARCH_RISCV_SRC_ESP32C3_LEGACY_ONESHOT_H
+#define __ARCH_RISCV_SRC_ESP32C3_LEGACY_ONESHOT_H
 
 /****************************************************************************
  * Included Files
@@ -201,4 +201,4 @@ int esp32c3_oneshot_current(struct esp32c3_oneshot_s *oneshot,
 #endif
 
 #endif /* CONFIG_ESP32C3_ONESHOT */
-#endif /* __ARCH_RISCV_SRC_ESP32C3_ONESHOT_H */
+#endif /* __ARCH_RISCV_SRC_ESP32C3_LEGACY_ONESHOT_H */
diff --git a/arch/risc-v/src/esp32c3/esp32c3_oneshot_lowerhalf.c b/arch/risc-v/src/esp32c3-legacy/esp32c3_oneshot_lowerhalf.c
similarity index 99%
rename from arch/risc-v/src/esp32c3/esp32c3_oneshot_lowerhalf.c
rename to arch/risc-v/src/esp32c3-legacy/esp32c3_oneshot_lowerhalf.c
index dced59ae58e..ae400ca6d09 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_oneshot_lowerhalf.c
+++ b/arch/risc-v/src/esp32c3-legacy/esp32c3_oneshot_lowerhalf.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/src/esp32c3/esp32c3_oneshot_lowerhalf.c
+ * arch/risc-v/src/esp32c3-legacy/esp32c3_oneshot_lowerhalf.c
  *
  * 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/esp32c3/esp32c3_partition.c b/arch/risc-v/src/esp32c3-legacy/esp32c3_partition.c
similarity index 99%
rename from arch/risc-v/src/esp32c3/esp32c3_partition.c
rename to arch/risc-v/src/esp32c3-legacy/esp32c3_partition.c
index ad5e48c4fac..338db2091c7 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_partition.c
+++ b/arch/risc-v/src/esp32c3-legacy/esp32c3_partition.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/src/esp32c3/esp32c3_partition.c
+ * arch/risc-v/src/esp32c3-legacy/esp32c3_partition.c
  *
  * 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/esp32c3/esp32c3_partition.h b/arch/risc-v/src/esp32c3-legacy/esp32c3_partition.h
similarity index 89%
rename from arch/risc-v/src/esp32c3/esp32c3_partition.h
rename to arch/risc-v/src/esp32c3-legacy/esp32c3_partition.h
index 033411303b0..de9413b163b 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_partition.h
+++ b/arch/risc-v/src/esp32c3-legacy/esp32c3_partition.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/src/esp32c3/esp32c3_partition.h
+ * arch/risc-v/src/esp32c3-legacy/esp32c3_partition.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_SRC_ESP32C3_ESP32C3_PARTITION_H
-#define __ARCH_RISCV_SRC_ESP32C3_ESP32C3_PARTITION_H
+#ifndef __ARCH_RISCV_SRC_ESP32C3_LEGACY_ESP32C3_PARTITION_H
+#define __ARCH_RISCV_SRC_ESP32C3_LEGACY_ESP32C3_PARTITION_H
 
 /****************************************************************************
  * Included Files
@@ -69,4 +69,4 @@ int esp32c3_partition_init(void);
 #undef EXTERN
 
 #endif /* __ASSEMBLY__ */
-#endif /* __ARCH_RISCV_SRC_ESP32C3_ESP32C3_PARTITION_H */
+#endif /* __ARCH_RISCV_SRC_ESP32C3_LEGACY_ESP32C3_PARTITION_H */
diff --git a/arch/risc-v/src/esp32c3/esp32c3_perf.c b/arch/risc-v/src/esp32c3-legacy/esp32c3_perf.c
similarity index 98%
rename from arch/risc-v/src/esp32c3/esp32c3_perf.c
rename to arch/risc-v/src/esp32c3-legacy/esp32c3_perf.c
index 5e187b4ac3e..0eb5e9d5126 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_perf.c
+++ b/arch/risc-v/src/esp32c3-legacy/esp32c3_perf.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/src/esp32c3/esp32c3_perf.c
+ * arch/risc-v/src/esp32c3-legacy/esp32c3_perf.c
  *
  * 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/esp32c3/esp32c3_pm.c b/arch/risc-v/src/esp32c3-legacy/esp32c3_pm.c
similarity index 99%
rename from arch/risc-v/src/esp32c3/esp32c3_pm.c
rename to arch/risc-v/src/esp32c3-legacy/esp32c3_pm.c
index 3c9ce4e879c..7c578a49c08 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_pm.c
+++ b/arch/risc-v/src/esp32c3-legacy/esp32c3_pm.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/src/esp32c3/esp32c3_pm.c
+ * arch/risc-v/src/esp32c3-legacy/esp32c3_pm.c
  *
  * 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/esp32c3/esp32c3_pm.h b/arch/risc-v/src/esp32c3-legacy/esp32c3_pm.h
similarity index 97%
rename from arch/risc-v/src/esp32c3/esp32c3_pm.h
rename to arch/risc-v/src/esp32c3-legacy/esp32c3_pm.h
index 28dcec273c2..0b7eb87d35a 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_pm.h
+++ b/arch/risc-v/src/esp32c3-legacy/esp32c3_pm.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/src/esp32c3/esp32c3_pm.h
+ * arch/risc-v/src/esp32c3-legacy/esp32c3_pm.h
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -22,8 +22,8 @@
  * Included Files
  ****************************************************************************/
 
-#ifndef __ARCH_RISCV_SRC_ESP32C3_ESP32C3_PM_H
-#define __ARCH_RISCV_SRC_ESP32C3_ESP32C3_PM_H
+#ifndef __ARCH_RISCV_SRC_ESP32C3_LEGACY_ESP32C3_PM_H
+#define __ARCH_RISCV_SRC_ESP32C3_LEGACY_ESP32C3_PM_H
 
 /****************************************************************************
  * Included Files
@@ -281,4 +281,4 @@ int esp32c3_pm_unregister_skip_sleep_callback(skip_light_sleep_cb_t cb);
 #undef EXTERN
 
 #endif /* __ASSEMBLY__ */
-#endif /* __ARCH_RISCV_SRC_ESP32C3_ESP32C3_PM_H */
+#endif /* __ARCH_RISCV_SRC_ESP32C3_LEGACY_ESP32C3_PM_H */
diff --git a/arch/risc-v/src/esp32c3/esp32c3_pminitialize.c b/arch/risc-v/src/esp32c3-legacy/esp32c3_pminitialize.c
similarity index 96%
rename from arch/risc-v/src/esp32c3/esp32c3_pminitialize.c
rename to arch/risc-v/src/esp32c3-legacy/esp32c3_pminitialize.c
index 68fffcb8bb8..274b1cad7fe 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_pminitialize.c
+++ b/arch/risc-v/src/esp32c3-legacy/esp32c3_pminitialize.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/src/esp32c3/esp32c3_pminitialize.c
+ * arch/risc-v/src/esp32c3-legacy/esp32c3_pminitialize.c
  *
  * 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/esp32c3/esp32c3_region.c b/arch/risc-v/src/esp32c3-legacy/esp32c3_region.c
similarity index 99%
rename from arch/risc-v/src/esp32c3/esp32c3_region.c
rename to arch/risc-v/src/esp32c3-legacy/esp32c3_region.c
index ebad5821c14..cf766993d4f 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_region.c
+++ b/arch/risc-v/src/esp32c3-legacy/esp32c3_region.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/src/esp32c3/esp32c3_region.c
+ * arch/risc-v/src/esp32c3-legacy/esp32c3_region.c
  *
  * 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/esp32c3/esp32c3_region.h b/arch/risc-v/src/esp32c3-legacy/esp32c3_region.h
similarity index 90%
rename from arch/risc-v/src/esp32c3/esp32c3_region.h
rename to arch/risc-v/src/esp32c3-legacy/esp32c3_region.h
index a81e1b5ed4b..0528b7e9ffe 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_region.h
+++ b/arch/risc-v/src/esp32c3-legacy/esp32c3_region.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/src/esp32c3/esp32c3_region.h
+ * arch/risc-v/src/esp32c3-legacy/esp32c3_region.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_SRC_ESP32C3_ESP32C3_REGION_H
-#define __ARCH_RISCV_SRC_ESP32C3_ESP32C3_REGION_H
+#ifndef __ARCH_RISCV_SRC_ESP32C3_LEGACY_ESP32C3_REGION_H
+#define __ARCH_RISCV_SRC_ESP32C3_LEGACY_ESP32C3_REGION_H
 
 /****************************************************************************
  * Included Files
@@ -68,4 +68,4 @@ void esp32c3_region_protection(void);
 
 #endif /* __ASSEMBLY__ */
 
-#endif /* __ARCH_RISCV_SRC_ESP32C3_ESP32C3_REGION_H */
+#endif /* __ARCH_RISCV_SRC_ESP32C3_LEGACY_ESP32C3_REGION_H */
diff --git a/arch/risc-v/src/esp32c3/esp32c3_resetcause.c b/arch/risc-v/src/esp32c3-legacy/esp32c3_resetcause.c
similarity index 97%
rename from arch/risc-v/src/esp32c3/esp32c3_resetcause.c
rename to arch/risc-v/src/esp32c3-legacy/esp32c3_resetcause.c
index 00ede72ff48..4d61d08b7b5 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_resetcause.c
+++ b/arch/risc-v/src/esp32c3-legacy/esp32c3_resetcause.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/src/esp32c3/esp32c3_resetcause.c
+ * arch/risc-v/src/esp32c3-legacy/esp32c3_resetcause.c
  *
  * 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/esp32c3/esp32c3_resetcause.h b/arch/risc-v/src/esp32c3-legacy/esp32c3_resetcause.h
similarity index 97%
rename from arch/risc-v/src/esp32c3/esp32c3_resetcause.h
rename to arch/risc-v/src/esp32c3-legacy/esp32c3_resetcause.h
index abc9ae908a2..fbbcc65005e 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_resetcause.h
+++ b/arch/risc-v/src/esp32c3-legacy/esp32c3_resetcause.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/src/esp32c3/esp32c3_resetcause.h
+ * arch/risc-v/src/esp32c3-legacy/esp32c3_resetcause.h
  *
  * 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/esp32c3/esp32c3_rng.c b/arch/risc-v/src/esp32c3-legacy/esp32c3_rng.c
similarity index 99%
rename from arch/risc-v/src/esp32c3/esp32c3_rng.c
rename to arch/risc-v/src/esp32c3-legacy/esp32c3_rng.c
index f0e59e41b63..e7d0d0f571f 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_rng.c
+++ b/arch/risc-v/src/esp32c3-legacy/esp32c3_rng.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/src/esp32c3/esp32c3_rng.c
+ * arch/risc-v/src/esp32c3-legacy/esp32c3_rng.c
  *
  * 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/esp32c3/esp32c3_rsa.c b/arch/risc-v/src/esp32c3-legacy/esp32c3_rsa.c
similarity index 99%
rename from arch/risc-v/src/esp32c3/esp32c3_rsa.c
rename to arch/risc-v/src/esp32c3-legacy/esp32c3_rsa.c
index 965b610b213..a9d2057b475 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_rsa.c
+++ b/arch/risc-v/src/esp32c3-legacy/esp32c3_rsa.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/src/esp32c3/esp32c3_rsa.c
+ * arch/risc-v/src/esp32c3-legacy/esp32c3_rsa.c
  *
  * 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/esp32c3/esp32c3_rsa.h b/arch/risc-v/src/esp32c3-legacy/esp32c3_rsa.h
similarity index 98%
rename from arch/risc-v/src/esp32c3/esp32c3_rsa.h
rename to arch/risc-v/src/esp32c3-legacy/esp32c3_rsa.h
index 9d99ca5c9c3..22e4c0a77ea 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_rsa.h
+++ b/arch/risc-v/src/esp32c3-legacy/esp32c3_rsa.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/src/esp32c3/esp32c3_rsa.h
+ * arch/risc-v/src/esp32c3-legacy/esp32c3_rsa.h
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -22,8 +22,8 @@
  * Included Files
  ****************************************************************************/
 
-#ifndef __ARCH_RISCV_SRC_ESP32C3_ESP32C3_RSA_H
-#define __ARCH_RISCV_SRC_ESP32C3_ESP32C3_RSA_H
+#ifndef __ARCH_RISCV_SRC_ESP32C3_LEGACY_ESP32C3_RSA_H
+#define __ARCH_RISCV_SRC_ESP32C3_LEGACY_ESP32C3_RSA_H
 
 #include <nuttx/config.h>
 #include <stdint.h>
@@ -508,4 +508,4 @@ void esp32c3_rsa_free(struct esp32c3_rsa_context_s *ctx);
 #undef EXTERN
 
 #endif /* __ASSEMBLY__ */
-#endif /* __ARCH_RISCV_SRC_ESP32C3_ESP32C3_RSA_H */
+#endif /* __ARCH_RISCV_SRC_ESP32C3_LEGACY_ESP32C3_RSA_H */
diff --git a/arch/risc-v/src/esp32c3/esp32c3_rt_timer.c b/arch/risc-v/src/esp32c3-legacy/esp32c3_rt_timer.c
similarity index 99%
rename from arch/risc-v/src/esp32c3/esp32c3_rt_timer.c
rename to arch/risc-v/src/esp32c3-legacy/esp32c3_rt_timer.c
index 5880922492f..3d395d8bb34 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_rt_timer.c
+++ b/arch/risc-v/src/esp32c3-legacy/esp32c3_rt_timer.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/src/esp32c3/esp32c3_rt_timer.c
+ * arch/risc-v/src/esp32c3-legacy/esp32c3_rt_timer.c
  *
  * 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/esp32c3/esp32c3_rt_timer.h b/arch/risc-v/src/esp32c3-legacy/esp32c3_rt_timer.h
similarity index 96%
rename from arch/risc-v/src/esp32c3/esp32c3_rt_timer.h
rename to arch/risc-v/src/esp32c3-legacy/esp32c3_rt_timer.h
index 86cb10897e6..b54c7237a11 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_rt_timer.h
+++ b/arch/risc-v/src/esp32c3-legacy/esp32c3_rt_timer.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/src/esp32c3/esp32c3_rt_timer.h
+ * arch/risc-v/src/esp32c3-legacy/esp32c3_rt_timer.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_SRC_ESP32C3_ESP32C3_RT_TIMER_H
-#define __ARCH_RISCV_SRC_ESP32C3_ESP32C3_RT_TIMER_H
+#ifndef __ARCH_RISCV_SRC_ESP32C3_LEGACY_ESP32C3_RT_TIMER_H
+#define __ARCH_RISCV_SRC_ESP32C3_LEGACY_ESP32C3_RT_TIMER_H
 
 /****************************************************************************
  * Included Files
@@ -241,4 +241,4 @@ void esp32c3_rt_timer_deinit(void);
 #endif
 #undef EXTERN
 
-#endif /* __ARCH_RISCV_SRC_ESP32C3_ESP32C3_RT_TIMER_H */
+#endif /* __ARCH_RISCV_SRC_ESP32C3_LEGACY_ESP32C3_RT_TIMER_H */
diff --git a/arch/risc-v/src/esp32c3/esp32c3_rtc.c b/arch/risc-v/src/esp32c3-legacy/esp32c3_rtc.c
similarity index 99%
rename from arch/risc-v/src/esp32c3/esp32c3_rtc.c
rename to arch/risc-v/src/esp32c3-legacy/esp32c3_rtc.c
index af881e75f70..8019e9a0ac9 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_rtc.c
+++ b/arch/risc-v/src/esp32c3-legacy/esp32c3_rtc.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/src/esp32c3/esp32c3_rtc.c
+ * arch/risc-v/src/esp32c3-legacy/esp32c3_rtc.c
  *
  * 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/esp32c3/esp32c3_rtc.h b/arch/risc-v/src/esp32c3-legacy/esp32c3_rtc.h
similarity index 99%
rename from arch/risc-v/src/esp32c3/esp32c3_rtc.h
rename to arch/risc-v/src/esp32c3-legacy/esp32c3_rtc.h
index d26fbddbf77..203b290237a 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_rtc.h
+++ b/arch/risc-v/src/esp32c3-legacy/esp32c3_rtc.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/src/esp32c3/esp32c3_rtc.h
+ * arch/risc-v/src/esp32c3-legacy/esp32c3_rtc.h
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -22,8 +22,8 @@
  * Included Files
  ****************************************************************************/
 
-#ifndef __ARCH_RISCV_SRC_ESP32C3_ESP32C3_RTC_H
-#define __ARCH_RISCV_SRC_ESP32C3_ESP32C3_RTC_H
+#ifndef __ARCH_RISCV_SRC_ESP32C3_LEGACY_ESP32C3_RTC_H
+#define __ARCH_RISCV_SRC_ESP32C3_LEGACY_ESP32C3_RTC_H
 
 /****************************************************************************
  * Included Files
@@ -734,4 +734,4 @@ int up_rtc_timer_init(void);
 #undef EXTERN
 
 #endif /* __ASSEMBLY__ */
-#endif /* __ARCH_RISCV_SRC_ESP32C3_ESP32C3_RTC_H */
+#endif /* __ARCH_RISCV_SRC_ESP32C3_LEGACY_ESP32C3_RTC_H */
diff --git a/arch/risc-v/src/esp32c3/esp32c3_rtc_gpio.c b/arch/risc-v/src/esp32c3-legacy/esp32c3_rtc_gpio.c
similarity index 99%
rename from arch/risc-v/src/esp32c3/esp32c3_rtc_gpio.c
rename to arch/risc-v/src/esp32c3-legacy/esp32c3_rtc_gpio.c
index a73209999ef..d8c419303eb 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_rtc_gpio.c
+++ b/arch/risc-v/src/esp32c3-legacy/esp32c3_rtc_gpio.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/src/esp32c3/esp32c3_rtc_gpio.c
+ * arch/risc-v/src/esp32c3-legacy/esp32c3_rtc_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/arch/risc-v/src/esp32c3/esp32c3_rtc_gpio.h b/arch/risc-v/src/esp32c3-legacy/esp32c3_rtc_gpio.h
similarity index 94%
rename from arch/risc-v/src/esp32c3/esp32c3_rtc_gpio.h
rename to arch/risc-v/src/esp32c3-legacy/esp32c3_rtc_gpio.h
index cccdfc216c1..7eb8a2f6674 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_rtc_gpio.h
+++ b/arch/risc-v/src/esp32c3-legacy/esp32c3_rtc_gpio.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/src/esp32c3/esp32c3_rtc_gpio.h
+ * arch/risc-v/src/esp32c3-legacy/esp32c3_rtc_gpio.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_SRC_ESP32C3_ESP32C3_RTC_GPIO_H
-#define __ARCH_RISCV_SRC_ESP32C3_ESP32C3_RTC_GPIO_H
+#ifndef __ARCH_RISCV_SRC_ESP32C3_LEGACY_ESP32C3_RTC_GPIO_H
+#define __ARCH_RISCV_SRC_ESP32C3_LEGACY_ESP32C3_RTC_GPIO_H
 
 /****************************************************************************
  * Included Files
@@ -146,4 +146,4 @@ void esp32c3_rtcioirqdisable(int irq);
 #endif
 
 #endif /* __ASSEMBLY__ */
-#endif /* __ARCH_RISCV_SRC_ESP32C3_ESP32C3_RTC_GPIO_H */
+#endif /* __ARCH_RISCV_SRC_ESP32C3_LEGACY_ESP32C3_RTC_GPIO_H */
diff --git a/arch/risc-v/src/esp32c3/esp32c3_rtc_lowerhalf.c b/arch/risc-v/src/esp32c3-legacy/esp32c3_rtc_lowerhalf.c
similarity index 99%
rename from arch/risc-v/src/esp32c3/esp32c3_rtc_lowerhalf.c
rename to arch/risc-v/src/esp32c3-legacy/esp32c3_rtc_lowerhalf.c
index 017c4a91a7e..e962490f110 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_rtc_lowerhalf.c
+++ b/arch/risc-v/src/esp32c3-legacy/esp32c3_rtc_lowerhalf.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/src/esp32c3/esp32c3_rtc_lowerhalf.c
+ * arch/risc-v/src/esp32c3-legacy/esp32c3_rtc_lowerhalf.c
  *
  * 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/esp32c3/esp32c3_rtc_lowerhalf.h b/arch/risc-v/src/esp32c3-legacy/esp32c3_rtc_lowerhalf.h
similarity index 88%
rename from arch/risc-v/src/esp32c3/esp32c3_rtc_lowerhalf.h
rename to arch/risc-v/src/esp32c3-legacy/esp32c3_rtc_lowerhalf.h
index 452570d0e54..8c42f967ce5 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_rtc_lowerhalf.h
+++ b/arch/risc-v/src/esp32c3-legacy/esp32c3_rtc_lowerhalf.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/src/esp32c3/esp32c3_rtc_lowerhalf.h
+ * arch/risc-v/src/esp32c3-legacy/esp32c3_rtc_lowerhalf.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_SRC_ESP32C3_ESP32C3_RTC_LOWERHALF_H
-#define __ARCH_RISCV_SRC_ESP32C3_ESP32C3_RTC_LOWERHALF_H
+#ifndef __ARCH_RISCV_SRC_ESP32C3_LEGACY_ESP32C3_RTC_LOWERHALF_H
+#define __ARCH_RISCV_SRC_ESP32C3_LEGACY_ESP32C3_RTC_LOWERHALF_H
 
 /****************************************************************************
  * Included Files
@@ -53,4 +53,4 @@ int esp32c3_rtc_driverinit(void);
 
 #endif /* CONFIG_RTC_DRIVER */
 
-#endif /* __ARCH_RISCV_SRC_ESP32C3_ESP32C3_RTC_LOWERHALF_H */
+#endif /* __ARCH_RISCV_SRC_ESP32C3_LEGACY_ESP32C3_RTC_LOWERHALF_H */
diff --git a/arch/risc-v/src/esp32c3/esp32c3_rtcheap.c b/arch/risc-v/src/esp32c3-legacy/esp32c3_rtcheap.c
similarity index 98%
rename from arch/risc-v/src/esp32c3/esp32c3_rtcheap.c
rename to arch/risc-v/src/esp32c3-legacy/esp32c3_rtcheap.c
index 7db37cd6cb1..c7ada6ed769 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_rtcheap.c
+++ b/arch/risc-v/src/esp32c3-legacy/esp32c3_rtcheap.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/src/esp32c3/esp32c3_rtcheap.c
+ * arch/risc-v/src/esp32c3-legacy/esp32c3_rtcheap.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -54,7 +54,7 @@ void esp32c3_rtcheap_initialize(void)
 
   /* These values come from the linker scripts
    * (<legacy/mcuboot>_sections.ld and flat_memory.ld).
-   * Check boards/risc-v/esp32c3.
+   * Check boards/risc-v/esp32c3-legacy.
    */
 
   extern uint8_t _srtcheap[];
diff --git a/arch/risc-v/src/esp32c3/esp32c3_rtcheap.h b/arch/risc-v/src/esp32c3-legacy/esp32c3_rtcheap.h
similarity index 95%
rename from arch/risc-v/src/esp32c3/esp32c3_rtcheap.h
rename to arch/risc-v/src/esp32c3-legacy/esp32c3_rtcheap.h
index 88ab9b68725..29253466802 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_rtcheap.h
+++ b/arch/risc-v/src/esp32c3-legacy/esp32c3_rtcheap.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/src/esp32c3/esp32c3_rtcheap.h
+ * arch/risc-v/src/esp32c3-legacy/esp32c3_rtcheap.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_SRC_ESP32C3_ESP32C3_RTCHEAP_H
-#define __ARCH_RISCV_SRC_ESP32C3_ESP32C3_RTCHEAP_H
+#ifndef __ARCH_RISCV_SRC_ESP32C3_LEGACY_ESP32C3_RTCHEAP_H
+#define __ARCH_RISCV_SRC_ESP32C3_LEGACY_ESP32C3_RTCHEAP_H
 
 /****************************************************************************
  * Public Function Prototypes
@@ -143,4 +143,4 @@ struct mallinfo esp32c3_rtcheap_mallinfo(void);
 }
 #endif
 
-#endif /* __ARCH_RISCV_SRC_ESP32C3_ESP32C3_RTCHEAP_H */
+#endif /* __ARCH_RISCV_SRC_ESP32C3_LEGACY_ESP32C3_RTCHEAP_H */
diff --git a/arch/risc-v/src/esp32c3/esp32c3_serial.c b/arch/risc-v/src/esp32c3-legacy/esp32c3_serial.c
similarity index 99%
rename from arch/risc-v/src/esp32c3/esp32c3_serial.c
rename to arch/risc-v/src/esp32c3-legacy/esp32c3_serial.c
index 31a2532dd59..f85d1a74188 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_serial.c
+++ b/arch/risc-v/src/esp32c3-legacy/esp32c3_serial.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/src/esp32c3/esp32c3_serial.c
+ * arch/risc-v/src/esp32c3-legacy/esp32c3_serial.c
  *
  * 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/esp32c3/esp32c3_sha.c b/arch/risc-v/src/esp32c3-legacy/esp32c3_sha.c
similarity index 99%
rename from arch/risc-v/src/esp32c3/esp32c3_sha.c
rename to arch/risc-v/src/esp32c3-legacy/esp32c3_sha.c
index db8ec46d768..cd83b72af76 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_sha.c
+++ b/arch/risc-v/src/esp32c3-legacy/esp32c3_sha.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/src/esp32c3/esp32c3_sha.c
+ * arch/risc-v/src/esp32c3-legacy/esp32c3_sha.c
  *
  * 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/esp32c3/esp32c3_sha.h b/arch/risc-v/src/esp32c3-legacy/esp32c3_sha.h
similarity index 97%
rename from arch/risc-v/src/esp32c3/esp32c3_sha.h
rename to arch/risc-v/src/esp32c3-legacy/esp32c3_sha.h
index 8c732ffcba9..a5ccdaf6f8c 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_sha.h
+++ b/arch/risc-v/src/esp32c3-legacy/esp32c3_sha.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/src/esp32c3/esp32c3_sha.h
+ * arch/risc-v/src/esp32c3-legacy/esp32c3_sha.h
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -22,8 +22,8 @@
  * Included Files
  ****************************************************************************/
 
-#ifndef __ARCH_RISCV_SRC_ESP32C3_ESP32C3_SHA_H
-#define __ARCH_RISCV_SRC_ESP32C3_ESP32C3_SHA_H
+#ifndef __ARCH_RISCV_SRC_ESP32C3_LEGACY_ESP32C3_SHA_H
+#define __ARCH_RISCV_SRC_ESP32C3_LEGACY_ESP32C3_SHA_H
 
 #include <nuttx/config.h>
 #include <stdint.h>
@@ -266,4 +266,4 @@ int esp32c3_sha256_finish(struct esp32c3_sha256_context_s *ctx,
 #undef EXTERN
 
 #endif /* __ASSEMBLY__ */
-#endif /* __ARCH_RISCV_SRC_ESP32C3_ESP32C3_SHA_H */
+#endif /* __ARCH_RISCV_SRC_ESP32C3_LEGACY_ESP32C3_SHA_H */
diff --git a/arch/risc-v/src/esp32c3/esp32c3_spi.c b/arch/risc-v/src/esp32c3-legacy/esp32c3_spi.c
similarity index 99%
rename from arch/risc-v/src/esp32c3/esp32c3_spi.c
rename to arch/risc-v/src/esp32c3-legacy/esp32c3_spi.c
index daab611eb6c..f1ad8f840d7 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_spi.c
+++ b/arch/risc-v/src/esp32c3-legacy/esp32c3_spi.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/src/esp32c3/esp32c3_spi.c
+ * arch/risc-v/src/esp32c3-legacy/esp32c3_spi.c
  *
  * 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/esp32c3/esp32c3_spi.h b/arch/risc-v/src/esp32c3-legacy/esp32c3_spi.h
similarity index 96%
rename from arch/risc-v/src/esp32c3/esp32c3_spi.h
rename to arch/risc-v/src/esp32c3-legacy/esp32c3_spi.h
index 6f983c33710..68a62e8eb85 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_spi.h
+++ b/arch/risc-v/src/esp32c3-legacy/esp32c3_spi.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/src/esp32c3/esp32c3_spi.h
+ * arch/risc-v/src/esp32c3-legacy/esp32c3_spi.h
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -22,8 +22,8 @@
  * Included Files
  ****************************************************************************/
 
-#ifndef __ARCH_RISCV_SRC_ESP32C3_ESP32C3_SPI_H
-#define __ARCH_RISCV_SRC_ESP32C3_ESP32C3_SPI_H
+#ifndef __ARCH_RISCV_SRC_ESP32C3_LEGACY_ESP32C3_SPI_H
+#define __ARCH_RISCV_SRC_ESP32C3_LEGACY_ESP32C3_SPI_H
 
 /****************************************************************************
  * Included Files
@@ -167,4 +167,4 @@ int esp32c3_spislave_ctrlr_uninitialize(struct spi_slave_ctrlr_s *ctrlr);
 #undef EXTERN
 
 #endif /* __ASSEMBLY__ */
-#endif /* __ARCH_RISCV_SRC_ESP32C3_ESP32C3_SPI_H */
+#endif /* __ARCH_RISCV_SRC_ESP32C3_LEGACY_ESP32C3_SPI_H */
diff --git a/arch/risc-v/src/esp32c3/esp32c3_spi_slave.c b/arch/risc-v/src/esp32c3-legacy/esp32c3_spi_slave.c
similarity index 99%
rename from arch/risc-v/src/esp32c3/esp32c3_spi_slave.c
rename to arch/risc-v/src/esp32c3-legacy/esp32c3_spi_slave.c
index ef0f4d21ed7..3bc8e8b9b3f 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_spi_slave.c
+++ b/arch/risc-v/src/esp32c3-legacy/esp32c3_spi_slave.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/src/esp32c3/esp32c3_spi_slave.c
+ * arch/risc-v/src/esp32c3-legacy/esp32c3_spi_slave.c
  *
  * 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/esp32c3/esp32c3_spiflash.c b/arch/risc-v/src/esp32c3-legacy/esp32c3_spiflash.c
similarity index 99%
rename from arch/risc-v/src/esp32c3/esp32c3_spiflash.c
rename to arch/risc-v/src/esp32c3-legacy/esp32c3_spiflash.c
index 9cccbe02e35..3f3efae19dd 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_spiflash.c
+++ b/arch/risc-v/src/esp32c3-legacy/esp32c3_spiflash.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/src/esp32c3/esp32c3_spiflash.c
+ * arch/risc-v/src/esp32c3-legacy/esp32c3_spiflash.c
  *
  * 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/esp32c3/esp32c3_spiflash.h b/arch/risc-v/src/esp32c3-legacy/esp32c3_spiflash.h
similarity index 94%
rename from arch/risc-v/src/esp32c3/esp32c3_spiflash.h
rename to arch/risc-v/src/esp32c3-legacy/esp32c3_spiflash.h
index 85125b8c14d..2747f6a0f04 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_spiflash.h
+++ b/arch/risc-v/src/esp32c3-legacy/esp32c3_spiflash.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/src/esp32c3/esp32c3_spiflash.h
+ * arch/risc-v/src/esp32c3-legacy/esp32c3_spiflash.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_SRC_ESP32C3_ESP32C3_SPIFLASH_H
-#define __ARCH_RISCV_SRC_ESP32C3_ESP32C3_SPIFLASH_H
+#ifndef __ARCH_RISCV_SRC_ESP32C3_LEGACY_ESP32C3_SPIFLASH_H
+#define __ARCH_RISCV_SRC_ESP32C3_LEGACY_ESP32C3_SPIFLASH_H
 
 /****************************************************************************
  * Included Files
@@ -129,4 +129,4 @@ int esp32c3_spiflash_init(void);
 #undef EXTERN
 
 #endif /* __ASSEMBLY__ */
-#endif /* __ARCH_RISCV_SRC_ESP32C3_ESP32C3_SPIFLASH_H */
+#endif /* __ARCH_RISCV_SRC_ESP32C3_LEGACY_ESP32C3_SPIFLASH_H */
diff --git a/arch/risc-v/src/esp32c3/esp32c3_spiflash_mtd.c b/arch/risc-v/src/esp32c3-legacy/esp32c3_spiflash_mtd.c
similarity index 99%
rename from arch/risc-v/src/esp32c3/esp32c3_spiflash_mtd.c
rename to arch/risc-v/src/esp32c3-legacy/esp32c3_spiflash_mtd.c
index 83c46b391aa..f7ec873ce7a 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_spiflash_mtd.c
+++ b/arch/risc-v/src/esp32c3-legacy/esp32c3_spiflash_mtd.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/src/esp32c3/esp32c3_spiflash_mtd.c
+ * arch/risc-v/src/esp32c3-legacy/esp32c3_spiflash_mtd.c
  *
  * 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/esp32c3/esp32c3_spiflash_mtd.h b/arch/risc-v/src/esp32c3-legacy/esp32c3_spiflash_mtd.h
similarity index 92%
rename from arch/risc-v/src/esp32c3/esp32c3_spiflash_mtd.h
rename to arch/risc-v/src/esp32c3-legacy/esp32c3_spiflash_mtd.h
index 1d0700ac934..cc23bf09b54 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_spiflash_mtd.h
+++ b/arch/risc-v/src/esp32c3-legacy/esp32c3_spiflash_mtd.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/src/esp32c3/esp32c3_spiflash_mtd.h
+ * arch/risc-v/src/esp32c3-legacy/esp32c3_spiflash_mtd.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_SRC_ESP32C3_ESP32C3_SPIFLASH_MTD_H
-#define __ARCH_RISCV_SRC_ESP32C3_ESP32C3_SPIFLASH_MTD_H
+#ifndef __ARCH_RISCV_SRC_ESP32C3_LEGACY_ESP32C3_SPIFLASH_MTD_H
+#define __ARCH_RISCV_SRC_ESP32C3_LEGACY_ESP32C3_SPIFLASH_MTD_H
 
 /****************************************************************************
  * Included Files
@@ -105,4 +105,4 @@ struct mtd_dev_s *esp32c3_spiflash_alloc_mtdpart(uint32_t mtd_offset,
 #undef EXTERN
 
 #endif /* __ASSEMBLY__ */
-#endif /* __ARCH_RISCV_SRC_ESP32C3_ESP32C3_SPIFLASH_MTD_H */
+#endif /* __ARCH_RISCV_SRC_ESP32C3_LEGACY_ESP32C3_SPIFLASH_MTD_H */
diff --git a/arch/risc-v/src/esp32c3/esp32c3_start.c b/arch/risc-v/src/esp32c3-legacy/esp32c3_start.c
similarity index 99%
rename from arch/risc-v/src/esp32c3/esp32c3_start.c
rename to arch/risc-v/src/esp32c3-legacy/esp32c3_start.c
index eba49d39ad7..c1c58b7ba11 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_start.c
+++ b/arch/risc-v/src/esp32c3-legacy/esp32c3_start.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/src/esp32c3/esp32c3_start.c
+ * arch/risc-v/src/esp32c3-legacy/esp32c3_start.c
  *
  * 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/esp32c3/esp32c3_start.h b/arch/risc-v/src/esp32c3-legacy/esp32c3_start.h
similarity index 90%
rename from arch/risc-v/src/esp32c3/esp32c3_start.h
rename to arch/risc-v/src/esp32c3-legacy/esp32c3_start.h
index f32ba06a01f..3e4db7ebe25 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_start.h
+++ b/arch/risc-v/src/esp32c3-legacy/esp32c3_start.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/src/esp32c3/esp32c3_start.h
+ * arch/risc-v/src/esp32c3-legacy/esp32c3_start.h
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -22,8 +22,8 @@
  * Included Files
  ****************************************************************************/
 
-#ifndef __ARCH_RISCV_SRC_ESP32C3_ESP32C3_START_H
-#define __ARCH_RISCV_SRC_ESP32C3_ESP32C3_START_H
+#ifndef __ARCH_RISCV_SRC_ESP32C3_LEGACY_ESP32C3_START_H
+#define __ARCH_RISCV_SRC_ESP32C3_LEGACY_ESP32C3_START_H
 
 /****************************************************************************
  * Included Files
@@ -52,4 +52,4 @@
 
 void esp32c3_board_initialize(void);
 
-#endif /* __ARCH_RISCV_SRC_ESP32C3_ESP32C3_START_H */
+#endif /* __ARCH_RISCV_SRC_ESP32C3_LEGACY_ESP32C3_START_H */
diff --git a/arch/risc-v/src/esp32c3/esp32c3_systemreset.c b/arch/risc-v/src/esp32c3-legacy/esp32c3_systemreset.c
similarity index 98%
rename from arch/risc-v/src/esp32c3/esp32c3_systemreset.c
rename to arch/risc-v/src/esp32c3-legacy/esp32c3_systemreset.c
index 219f5735cce..b6a99c70031 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_systemreset.c
+++ b/arch/risc-v/src/esp32c3-legacy/esp32c3_systemreset.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/src/esp32c3/esp32c3_systemreset.c
+ * arch/risc-v/src/esp32c3-legacy/esp32c3_systemreset.c
  *
  * 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/esp32c3/esp32c3_systemreset.h b/arch/risc-v/src/esp32c3-legacy/esp32c3_systemreset.h
similarity index 93%
rename from arch/risc-v/src/esp32c3/esp32c3_systemreset.h
rename to arch/risc-v/src/esp32c3-legacy/esp32c3_systemreset.h
index 184b5062441..5ce011bb0fd 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_systemreset.h
+++ b/arch/risc-v/src/esp32c3-legacy/esp32c3_systemreset.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/src/esp32c3/esp32c3_systemreset.h
+ * arch/risc-v/src/esp32c3-legacy/esp32c3_systemreset.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_SRC_ESP32C3_ESP32C3_SYSTEMRESET_H
-#define __ARCH_RISCV_SRC_ESP32C3_ESP32C3_SYSTEMRESET_H
+#ifndef __ARCH_RISCV_SRC_ESP32C3_LEGACY_ESP32C3_SYSTEMRESET_H
+#define __ARCH_RISCV_SRC_ESP32C3_LEGACY_ESP32C3_SYSTEMRESET_H
 
 /****************************************************************************
  * Included Files
@@ -102,4 +102,4 @@ void up_shutdown_handler(void);
 #undef EXTERN
 
 #endif /* __ASSEMBLY__ */
-#endif /* __ARCH_RISCV_SRC_ESP32C3_ESP32C3_SYSTEMRESET_H */
+#endif /* __ARCH_RISCV_SRC_ESP32C3_LEGACY_ESP32C3_SYSTEMRESET_H */
diff --git a/arch/risc-v/src/esp32c3/esp32c3_textheap.c b/arch/risc-v/src/esp32c3-legacy/esp32c3_textheap.c
similarity index 98%
rename from arch/risc-v/src/esp32c3/esp32c3_textheap.c
rename to arch/risc-v/src/esp32c3-legacy/esp32c3_textheap.c
index 52be45fe130..6286d24f75e 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_textheap.c
+++ b/arch/risc-v/src/esp32c3-legacy/esp32c3_textheap.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/src/esp32c3/esp32c3_textheap.c
+ * arch/risc-v/src/esp32c3-legacy/esp32c3_textheap.c
  *
  * 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/esp32c3/esp32c3_tickless.c b/arch/risc-v/src/esp32c3-legacy/esp32c3_tickless.c
similarity index 99%
rename from arch/risc-v/src/esp32c3/esp32c3_tickless.c
rename to arch/risc-v/src/esp32c3-legacy/esp32c3_tickless.c
index 15752ab0095..127419dd863 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_tickless.c
+++ b/arch/risc-v/src/esp32c3-legacy/esp32c3_tickless.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/src/esp32c3/esp32c3_tickless.c
+ * arch/risc-v/src/esp32c3-legacy/esp32c3_tickless.c
  *
  * 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/esp32c3/esp32c3_tickless.h b/arch/risc-v/src/esp32c3-legacy/esp32c3_tickless.h
similarity index 90%
rename from arch/risc-v/src/esp32c3/esp32c3_tickless.h
rename to arch/risc-v/src/esp32c3-legacy/esp32c3_tickless.h
index 7c0609eac6a..8efee32e500 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_tickless.h
+++ b/arch/risc-v/src/esp32c3-legacy/esp32c3_tickless.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/src/esp32c3/esp32c3_tickless.h
+ * arch/risc-v/src/esp32c3-legacy/esp32c3_tickless.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_SRC_ESP32C3_ESP32C3_TICKLESS_H
-#define __ARCH_RISCV_SRC_ESP32C3_ESP32C3_TICKLESS_H
+#ifndef __ARCH_RISCV_SRC_ESP32C3_LEGACY_ESP32C3_TICKLESS_H
+#define __ARCH_RISCV_SRC_ESP32C3_LEGACY_ESP32C3_TICKLESS_H
 
 /****************************************************************************
  * Included Files
@@ -64,4 +64,4 @@ uint32_t up_get_idletime(void);
 
 void up_step_idletime(uint32_t idletime_us);
 
-#endif /* __ARCH_RISCV_SRC_ESP32C3_ESP32C3_TICKLESS_H */
+#endif /* __ARCH_RISCV_SRC_ESP32C3_LEGACY_ESP32C3_TICKLESS_H */
diff --git a/arch/risc-v/src/esp32c3/esp32c3_tim.c b/arch/risc-v/src/esp32c3-legacy/esp32c3_tim.c
similarity index 99%
rename from arch/risc-v/src/esp32c3/esp32c3_tim.c
rename to arch/risc-v/src/esp32c3-legacy/esp32c3_tim.c
index 51e4aaf84af..280cd265b08 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_tim.c
+++ b/arch/risc-v/src/esp32c3-legacy/esp32c3_tim.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/src/esp32c3/esp32c3_tim.c
+ * arch/risc-v/src/esp32c3-legacy/esp32c3_tim.c
  *
  * 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/esp32c3/esp32c3_tim.h b/arch/risc-v/src/esp32c3-legacy/esp32c3_tim.h
similarity index 96%
rename from arch/risc-v/src/esp32c3/esp32c3_tim.h
rename to arch/risc-v/src/esp32c3-legacy/esp32c3_tim.h
index 3d5cda5393a..5d154928705 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_tim.h
+++ b/arch/risc-v/src/esp32c3-legacy/esp32c3_tim.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/src/esp32c3/esp32c3_tim.h
+ * arch/risc-v/src/esp32c3-legacy/esp32c3_tim.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_SRC_ESP32C3_ESP32C3_TIM_H
-#define __ARCH_RISCV_SRC_ESP32C3_ESP32C3_TIM_H
+#ifndef __ARCH_RISCV_SRC_ESP32C3_LEGACY_ESP32C3_TIM_H
+#define __ARCH_RISCV_SRC_ESP32C3_LEGACY_ESP32C3_TIM_H
 
 /****************************************************************************
  * Included Files
@@ -138,4 +138,4 @@ struct esp32c3_tim_ops_s
 struct esp32c3_tim_dev_s *esp32c3_tim_init(int timer);
 void esp32c3_tim_deinit(struct esp32c3_tim_dev_s *dev);
 
-#endif /* __ARCH_RISCV_SRC_ESP32C3_ESP32C3_TIM_H */
+#endif /* __ARCH_RISCV_SRC_ESP32C3_LEGACY_ESP32C3_TIM_H */
diff --git a/arch/risc-v/src/esp32c3/esp32c3_tim_lowerhalf.c b/arch/risc-v/src/esp32c3-legacy/esp32c3_tim_lowerhalf.c
similarity index 99%
rename from arch/risc-v/src/esp32c3/esp32c3_tim_lowerhalf.c
rename to arch/risc-v/src/esp32c3-legacy/esp32c3_tim_lowerhalf.c
index 89f5ff49857..6a45de98b6c 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_tim_lowerhalf.c
+++ b/arch/risc-v/src/esp32c3-legacy/esp32c3_tim_lowerhalf.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/src/esp32c3/esp32c3_tim_lowerhalf.c
+ * arch/risc-v/src/esp32c3-legacy/esp32c3_tim_lowerhalf.c
  *
  * 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/esp32c3/esp32c3_tim_lowerhalf.h b/arch/risc-v/src/esp32c3-legacy/esp32c3_tim_lowerhalf.h
similarity index 86%
rename from arch/risc-v/src/esp32c3/esp32c3_tim_lowerhalf.h
rename to arch/risc-v/src/esp32c3-legacy/esp32c3_tim_lowerhalf.h
index 3648564744f..06f6839b618 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_tim_lowerhalf.h
+++ b/arch/risc-v/src/esp32c3-legacy/esp32c3_tim_lowerhalf.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/src/esp32c3/esp32c3_tim_lowerhalf.h
+ * arch/risc-v/src/esp32c3-legacy/esp32c3_tim_lowerhalf.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_SRC_ESP32C3_ESP32C3_TIM_LOWERHALF_H
-#define __ARCH_RISCV_SRC_ESP32C3_ESP32C3_TIM_LOWERHALF_H
+#ifndef __ARCH_RISCV_SRC_ESP32C3_LEGACY_ESP32C3_TIM_LOWERHALF_H
+#define __ARCH_RISCV_SRC_ESP32C3_LEGACY_ESP32C3_TIM_LOWERHALF_H
 
 /****************************************************************************
  * Included Files
@@ -37,4 +37,4 @@
 
 int esp32c3_timer_initialize(const char *devpath, uint8_t timer);
 
-#endif /* __ARCH_RISCV_SRC_ESP32C3_ESP32C3_TIM_LOWERHALF_H */
+#endif /* __ARCH_RISCV_SRC_ESP32C3_LEGACY_ESP32C3_TIM_LOWERHALF_H */
diff --git a/arch/risc-v/src/esp32c3/esp32c3_timerisr.c b/arch/risc-v/src/esp32c3-legacy/esp32c3_timerisr.c
similarity index 98%
rename from arch/risc-v/src/esp32c3/esp32c3_timerisr.c
rename to arch/risc-v/src/esp32c3-legacy/esp32c3_timerisr.c
index 9560eb9e8b3..49536f0247e 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_timerisr.c
+++ b/arch/risc-v/src/esp32c3-legacy/esp32c3_timerisr.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/src/esp32c3/esp32c3_timerisr.c
+ * arch/risc-v/src/esp32c3-legacy/esp32c3_timerisr.c
  *
  * 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/esp32c3/esp32c3_twai.c b/arch/risc-v/src/esp32c3-legacy/esp32c3_twai.c
similarity index 99%
rename from arch/risc-v/src/esp32c3/esp32c3_twai.c
rename to arch/risc-v/src/esp32c3-legacy/esp32c3_twai.c
index b057fb6fd60..c99e091907d 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_twai.c
+++ b/arch/risc-v/src/esp32c3-legacy/esp32c3_twai.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/src/esp32c3/esp32c3_twai.c
+ * arch/risc-v/src/esp32c3-legacy/esp32c3_twai.c
  *
  * 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/esp32c3/esp32c3_twai.h b/arch/risc-v/src/esp32c3-legacy/esp32c3_twai.h
similarity index 92%
rename from arch/risc-v/src/esp32c3/esp32c3_twai.h
rename to arch/risc-v/src/esp32c3-legacy/esp32c3_twai.h
index d844426a616..de007589db0 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_twai.h
+++ b/arch/risc-v/src/esp32c3-legacy/esp32c3_twai.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/src/esp32c3/esp32c3_twai.h
+ * arch/risc-v/src/esp32c3-legacy/esp32c3_twai.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_SRC_ESP32C3_ESP32C3_TWAI_H
-#define __ARCH_RISCV_SRC_ESP32C3_ESP32C3_TWAI_H
+#ifndef __ARCH_RISCV_SRC_ESP32C3_LEGACY_ESP32C3_TWAI_H
+#define __ARCH_RISCV_SRC_ESP32C3_LEGACY_ESP32C3_TWAI_H
 
 /****************************************************************************
  * Included Files
@@ -74,4 +74,4 @@ struct can_dev_s *esp32c3_twaiinitialize(int port);
 #endif
 #endif /* __ASSEMBLY__ */
 
-#endif /* __ARCH_RISCV_SRC_ESP32C3_ESP32C3_TWAI_H */
+#endif /* __ARCH_RISCV_SRC_ESP32C3_LEGACY_ESP32C3_TWAI_H */
diff --git a/arch/risc-v/src/esp32c3/esp32c3_uid.c b/arch/risc-v/src/esp32c3-legacy/esp32c3_uid.c
similarity index 97%
rename from arch/risc-v/src/esp32c3/esp32c3_uid.c
rename to arch/risc-v/src/esp32c3-legacy/esp32c3_uid.c
index e823d056285..bc31744f4e0 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_uid.c
+++ b/arch/risc-v/src/esp32c3-legacy/esp32c3_uid.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/src/esp32c3/esp32c3_uid.c
+ * arch/risc-v/src/esp32c3-legacy/esp32c3_uid.c
  *
  * 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/esp32c3/esp32c3_uid.h b/arch/risc-v/src/esp32c3-legacy/esp32c3_uid.h
similarity index 88%
rename from arch/risc-v/src/esp32c3/esp32c3_uid.h
rename to arch/risc-v/src/esp32c3-legacy/esp32c3_uid.h
index 51c113c3e61..5c9e28db370 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_uid.h
+++ b/arch/risc-v/src/esp32c3-legacy/esp32c3_uid.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/src/esp32c3/esp32c3_uid.h
+ * arch/risc-v/src/esp32c3-legacy/esp32c3_uid.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_SRC_ESP32C3_ESP32C3_UID_H
-#define __ARCH_RISCV_SRC_ESP32C3_ESP32C3_UID_H
+#ifndef __ARCH_RISCV_SRC_ESP32C3_LEGACY_ESP32C3_UID_H
+#define __ARCH_RISCV_SRC_ESP32C3_LEGACY_ESP32C3_UID_H
 
 /****************************************************************************
  * Included Files
@@ -47,4 +47,4 @@
 
 void esp32c3_get_uniqueid(uint8_t *uniqueid);
 
-#endif /* __ARCH_RISCV_SRC_ESP32C3_ESP32C3_UID_H */
+#endif /* __ARCH_RISCV_SRC_ESP32C3_LEGACY_ESP32C3_UID_H */
diff --git a/arch/risc-v/src/esp32c3/esp32c3_usbserial.c b/arch/risc-v/src/esp32c3-legacy/esp32c3_usbserial.c
similarity index 99%
rename from arch/risc-v/src/esp32c3/esp32c3_usbserial.c
rename to arch/risc-v/src/esp32c3-legacy/esp32c3_usbserial.c
index 8cbb3972dfc..0fc2d518f7d 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_usbserial.c
+++ b/arch/risc-v/src/esp32c3-legacy/esp32c3_usbserial.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/src/esp32c3/esp32c3_usbserial.c
+ * arch/risc-v/src/esp32c3-legacy/esp32c3_usbserial.c
  *
  * 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/esp32c3/esp32c3_usbserial.h b/arch/risc-v/src/esp32c3-legacy/esp32c3_usbserial.h
similarity index 88%
rename from arch/risc-v/src/esp32c3/esp32c3_usbserial.h
rename to arch/risc-v/src/esp32c3-legacy/esp32c3_usbserial.h
index 9c5f3f958de..d9d2e5c75ac 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_usbserial.h
+++ b/arch/risc-v/src/esp32c3-legacy/esp32c3_usbserial.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/src/esp32c3/esp32c3_usbserial.h
+ * arch/risc-v/src/esp32c3-legacy/esp32c3_usbserial.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_SRC_ESP32C3_ESP32C3_USBSERIAL_H
-#define __ARCH_RISCV_SRC_ESP32C3_ESP32C3_USBSERIAL_H
+#ifndef __ARCH_RISCV_SRC_ESP32C3_LEGACY_ESP32C3_USBSERIAL_H
+#define __ARCH_RISCV_SRC_ESP32C3_LEGACY_ESP32C3_USBSERIAL_H
 
 /****************************************************************************
  * Included Files
@@ -48,4 +48,4 @@ extern uart_dev_t g_uart_usbserial;
 
 void esp32c3_usbserial_write(char ch);
 
-#endif /* __ARCH_RISCV_SRC_ESP32C3_ESP32C3_USBSERIAL_H */
+#endif /* __ARCH_RISCV_SRC_ESP32C3_LEGACY_ESP32C3_USBSERIAL_H */
diff --git a/arch/risc-v/src/esp32c3/esp32c3_userspace.c b/arch/risc-v/src/esp32c3-legacy/esp32c3_userspace.c
similarity index 99%
rename from arch/risc-v/src/esp32c3/esp32c3_userspace.c
rename to arch/risc-v/src/esp32c3-legacy/esp32c3_userspace.c
index 5628c90603a..fd8137788d2 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_userspace.c
+++ b/arch/risc-v/src/esp32c3-legacy/esp32c3_userspace.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/src/esp32c3/esp32c3_userspace.c
+ * arch/risc-v/src/esp32c3-legacy/esp32c3_userspace.c
  *
  * 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/esp32c3/esp32c3_userspace.h b/arch/risc-v/src/esp32c3-legacy/esp32c3_userspace.h
similarity index 88%
rename from arch/risc-v/src/esp32c3/esp32c3_userspace.h
rename to arch/risc-v/src/esp32c3-legacy/esp32c3_userspace.h
index bc1d1351740..216ec30d773 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_userspace.h
+++ b/arch/risc-v/src/esp32c3-legacy/esp32c3_userspace.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/src/esp32c3/esp32c3_userspace.h
+ * arch/risc-v/src/esp32c3-legacy/esp32c3_userspace.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_SRC_ESP32C3_ESP32C3_USERSPACE_H
-#define __ARCH_RISCV_SRC_ESP32C3_ESP32C3_USERSPACE_H
+#ifndef __ARCH_RISCV_SRC_ESP32C3_LEGACY_ESP32C3_USERSPACE_H
+#define __ARCH_RISCV_SRC_ESP32C3_LEGACY_ESP32C3_USERSPACE_H
 
 /****************************************************************************
  * Included Files
@@ -46,4 +46,4 @@
 void esp32c3_userspace(void);
 #endif
 
-#endif /* __ARCH_RISCV_SRC_ESP32C3_ESP32C3_USERSPACE_H */
+#endif /* __ARCH_RISCV_SRC_ESP32C3_LEGACY_ESP32C3_USERSPACE_H */
diff --git a/arch/risc-v/src/esp32c3/esp32c3_vectors.S b/arch/risc-v/src/esp32c3-legacy/esp32c3_vectors.S
similarity index 95%
rename from arch/risc-v/src/esp32c3/esp32c3_vectors.S
rename to arch/risc-v/src/esp32c3-legacy/esp32c3_vectors.S
index 25e16206099..ec69546f311 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_vectors.S
+++ b/arch/risc-v/src/esp32c3-legacy/esp32c3_vectors.S
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/src/esp32c3/esp32c3_vectors.S
+ * arch/risc-v/src/esp32c3-legacy/esp32c3_vectors.S
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -24,7 +24,7 @@
 
 #include <nuttx/config.h>
 #include <arch/irq.h>
-#include <arch/esp32c3/irq.h>
+#include <arch/esp32c3-legacy/irq.h>
 
 #include "chip.h"
 
diff --git a/arch/risc-v/src/esp32c3/esp32c3_wdt.c b/arch/risc-v/src/esp32c3-legacy/esp32c3_wdt.c
similarity index 99%
rename from arch/risc-v/src/esp32c3/esp32c3_wdt.c
rename to arch/risc-v/src/esp32c3-legacy/esp32c3_wdt.c
index e1cfe69a7ba..a908dc00fd9 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_wdt.c
+++ b/arch/risc-v/src/esp32c3-legacy/esp32c3_wdt.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/src/esp32c3/esp32c3_wdt.c
+ * arch/risc-v/src/esp32c3-legacy/esp32c3_wdt.c
  *
  * 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/esp32c3/esp32c3_wdt.h b/arch/risc-v/src/esp32c3-legacy/esp32c3_wdt.h
similarity index 96%
rename from arch/risc-v/src/esp32c3/esp32c3_wdt.h
rename to arch/risc-v/src/esp32c3-legacy/esp32c3_wdt.h
index 82b09d5f85e..78f00761fc0 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_wdt.h
+++ b/arch/risc-v/src/esp32c3-legacy/esp32c3_wdt.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/src/esp32c3/esp32c3_wdt.h
+ * arch/risc-v/src/esp32c3-legacy/esp32c3_wdt.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_SRC_ESP32C3_ESP32C3_WDT_H
-#define __ARCH_RISCV_SRC_ESP32C3_ESP32C3_WDT_H
+#ifndef __ARCH_RISCV_SRC_ESP32C3_LEGACY_ESP32C3_WDT_H
+#define __ARCH_RISCV_SRC_ESP32C3_LEGACY_ESP32C3_WDT_H
 
 /****************************************************************************
  * Included Files
@@ -144,4 +144,4 @@ void esp32c3_wdt_early_deinit(void);
 void esp32c3_wdt_deinit(struct esp32c3_wdt_dev_s *dev);
 bool esp32c3_wdt_is_running(struct esp32c3_wdt_dev_s *dev);
 
-#endif /* __ARCH_RISCV_SRC_ESP32C3_ESP32C3_WDT_H */
+#endif /* __ARCH_RISCV_SRC_ESP32C3_LEGACY_ESP32C3_WDT_H */
diff --git a/arch/risc-v/src/esp32c3/esp32c3_wdt_lowerhalf.c b/arch/risc-v/src/esp32c3-legacy/esp32c3_wdt_lowerhalf.c
similarity index 99%
rename from arch/risc-v/src/esp32c3/esp32c3_wdt_lowerhalf.c
rename to arch/risc-v/src/esp32c3-legacy/esp32c3_wdt_lowerhalf.c
index 490bf785357..bd22628a17a 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_wdt_lowerhalf.c
+++ b/arch/risc-v/src/esp32c3-legacy/esp32c3_wdt_lowerhalf.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/src/esp32c3/esp32c3_wdt_lowerhalf.c
+ * arch/risc-v/src/esp32c3-legacy/esp32c3_wdt_lowerhalf.c
  *
  * 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/esp32c3/esp32c3_wdt_lowerhalf.h b/arch/risc-v/src/esp32c3-legacy/esp32c3_wdt_lowerhalf.h
similarity index 89%
rename from arch/risc-v/src/esp32c3/esp32c3_wdt_lowerhalf.h
rename to arch/risc-v/src/esp32c3-legacy/esp32c3_wdt_lowerhalf.h
index 354e0d48aee..b16f94ddd53 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_wdt_lowerhalf.h
+++ b/arch/risc-v/src/esp32c3-legacy/esp32c3_wdt_lowerhalf.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/src/esp32c3/esp32c3_wdt_lowerhalf.h
+ * arch/risc-v/src/esp32c3-legacy/esp32c3_wdt_lowerhalf.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_SRC_ESP32C3_ESP32C3_WDT_LOWERHALF_H
-#define __ARCH_RISCV_SRC_ESP32C3_ESP32C3_WDT_LOWERHALF_H
+#ifndef __ARCH_RISCV_SRC_ESP32C3_LEGACY_ESP32C3_WDT_LOWERHALF_H
+#define __ARCH_RISCV_SRC_ESP32C3_LEGACY_ESP32C3_WDT_LOWERHALF_H
 
 /****************************************************************************
  * Included Files
@@ -55,4 +55,4 @@
 
 int esp32c3_wdt_initialize(const char *devpath, enum esp32c3_wdt_inst_e wdt);
 
-#endif /* __ARCH_RISCV_SRC_ESP32C3_ESP32C3_WDT_LOWERHALF_H */
+#endif /* __ARCH_RISCV_SRC_ESP32C3_LEGACY_ESP32C3_WDT_LOWERHALF_H */
diff --git a/arch/risc-v/src/esp32c3/esp32c3_wifi_adapter.c b/arch/risc-v/src/esp32c3-legacy/esp32c3_wifi_adapter.c
similarity index 99%
rename from arch/risc-v/src/esp32c3/esp32c3_wifi_adapter.c
rename to arch/risc-v/src/esp32c3-legacy/esp32c3_wifi_adapter.c
index 92a4377b361..0512f59e3b9 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_wifi_adapter.c
+++ b/arch/risc-v/src/esp32c3-legacy/esp32c3_wifi_adapter.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/src/esp32c3/esp32c3_wifi_adapter.c
+ * arch/risc-v/src/esp32c3-legacy/esp32c3_wifi_adapter.c
  *
  * 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/esp32c3/esp32c3_wifi_adapter.h b/arch/risc-v/src/esp32c3-legacy/esp32c3_wifi_adapter.h
similarity index 98%
rename from arch/risc-v/src/esp32c3/esp32c3_wifi_adapter.h
rename to arch/risc-v/src/esp32c3-legacy/esp32c3_wifi_adapter.h
index b3165d45a0b..5d81fa09549 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_wifi_adapter.h
+++ b/arch/risc-v/src/esp32c3-legacy/esp32c3_wifi_adapter.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/src/esp32c3/esp32c3_wifi_adapter.h
+ * arch/risc-v/src/esp32c3-legacy/esp32c3_wifi_adapter.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_SRC_ESP32C3_ESP32C3_WIFI_ADAPTER_H
-#define __ARCH_RISCV_SRC_ESP32C3_ESP32C3_WIFI_ADAPTER_H
+#ifndef __ARCH_RISCV_SRC_ESP32C3_LEGACY_ESP32C3_WIFI_ADAPTER_H
+#define __ARCH_RISCV_SRC_ESP32C3_LEGACY_ESP32C3_WIFI_ADAPTER_H
 
 /****************************************************************************
  * Included Files
@@ -858,4 +858,4 @@ void esp_wifi_stop_callback(void);
 #undef EXTERN
 
 #endif /* __ASSEMBLY__ */
-#endif /* __ARCH_RISCV_SRC_ESP32C3_ESP32C3_WIFI_ADAPTER_H */
+#endif /* __ARCH_RISCV_SRC_ESP32C3_LEGACY_ESP32C3_WIFI_ADAPTER_H */
diff --git a/arch/risc-v/src/esp32c3/esp32c3_wifi_utils.c b/arch/risc-v/src/esp32c3-legacy/esp32c3_wifi_utils.c
similarity index 99%
rename from arch/risc-v/src/esp32c3/esp32c3_wifi_utils.c
rename to arch/risc-v/src/esp32c3-legacy/esp32c3_wifi_utils.c
index 8c9ed90935b..fe12aa3588d 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_wifi_utils.c
+++ b/arch/risc-v/src/esp32c3-legacy/esp32c3_wifi_utils.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/src/esp32c3/esp32c3_wifi_utils.c
+ * arch/risc-v/src/esp32c3-legacy/esp32c3_wifi_utils.c
  *
  * 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/esp32c3/esp32c3_wifi_utils.h b/arch/risc-v/src/esp32c3-legacy/esp32c3_wifi_utils.h
similarity index 92%
rename from arch/risc-v/src/esp32c3/esp32c3_wifi_utils.h
rename to arch/risc-v/src/esp32c3-legacy/esp32c3_wifi_utils.h
index 00b10d32aaa..250b99f985f 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_wifi_utils.h
+++ b/arch/risc-v/src/esp32c3-legacy/esp32c3_wifi_utils.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/src/esp32c3/esp32c3_wifi_utils.h
+ * arch/risc-v/src/esp32c3-legacy/esp32c3_wifi_utils.h
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -22,8 +22,8 @@
  * Included Files
  ****************************************************************************/
 
-#ifndef __ARCH_RISCV_SRC_ESP32C3_ESP32C3_WIFI_UTILS_H
-#define __ARCH_RISCV_SRC_ESP32C3_ESP32C3_WIFI_UTILS_H
+#ifndef __ARCH_RISCV_SRC_ESP32C3_LEGACY_ESP32C3_WIFI_UTILS_H
+#define __ARCH_RISCV_SRC_ESP32C3_LEGACY_ESP32C3_WIFI_UTILS_H
 
 #include <nuttx/config.h>
 #include <nuttx/net/netdev.h>
@@ -101,4 +101,4 @@ void esp_wifi_scan_event_parse(void);
 #undef EXTERN
 
 #endif /* __ASSEMBLY__ */
-#endif /* __ARCH_RISCV_SRC_ESP32C3_ESP32C3_WIFI_UTILS_H */
+#endif /* __ARCH_RISCV_SRC_ESP32C3_LEGACY_ESP32C3_WIFI_UTILS_H */
diff --git a/arch/risc-v/src/esp32c3/esp32c3_wireless.c b/arch/risc-v/src/esp32c3-legacy/esp32c3_wireless.c
similarity index 99%
rename from arch/risc-v/src/esp32c3/esp32c3_wireless.c
rename to arch/risc-v/src/esp32c3-legacy/esp32c3_wireless.c
index e19ad3b10f1..3c51037fce9 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_wireless.c
+++ b/arch/risc-v/src/esp32c3-legacy/esp32c3_wireless.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/src/esp32c3/esp32c3_wireless.c
+ * arch/risc-v/src/esp32c3-legacy/esp32c3_wireless.c
  *
  * 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/esp32c3/esp32c3_wireless.h b/arch/risc-v/src/esp32c3-legacy/esp32c3_wireless.h
similarity index 95%
rename from arch/risc-v/src/esp32c3/esp32c3_wireless.h
rename to arch/risc-v/src/esp32c3-legacy/esp32c3_wireless.h
index 14da611eb16..6f6bde1f93c 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_wireless.h
+++ b/arch/risc-v/src/esp32c3-legacy/esp32c3_wireless.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/src/esp32c3/esp32c3_wireless.h
+ * arch/risc-v/src/esp32c3-legacy/esp32c3_wireless.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_SRC_ESP32C3_ESP32C3_WIRELESS_H
-#define __ARCH_RISCV_SRC_ESP32C3_ESP32C3_WIRELESS_H
+#ifndef __ARCH_RISCV_SRC_ESP32C3_LEGACY_ESP32C3_WIRELESS_H
+#define __ARCH_RISCV_SRC_ESP32C3_LEGACY_ESP32C3_WIRELESS_H
 
 /****************************************************************************
  * Included Files
@@ -191,4 +191,4 @@ int esp_read_mac(uint8_t *mac, esp_mac_type_t type);
 #undef EXTERN
 
 #endif /* __ASSEMBLY__ */
-#endif /* __ARCH_RISCV_SRC_ESP32C3_ESP32C3_WIRELESS_H */
+#endif /* __ARCH_RISCV_SRC_ESP32C3_LEGACY_ESP32C3_WIRELESS_H */
diff --git a/arch/risc-v/src/esp32c3/esp32c3_wlan.c b/arch/risc-v/src/esp32c3-legacy/esp32c3_wlan.c
similarity index 99%
rename from arch/risc-v/src/esp32c3/esp32c3_wlan.c
rename to arch/risc-v/src/esp32c3-legacy/esp32c3_wlan.c
index ecd1603b806..590aadf404f 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_wlan.c
+++ b/arch/risc-v/src/esp32c3-legacy/esp32c3_wlan.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/src/esp32c3/esp32c3_wlan.c
+ * arch/risc-v/src/esp32c3-legacy/esp32c3_wlan.c
  *
  * 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/esp32c3/esp32c3_wlan.h b/arch/risc-v/src/esp32c3-legacy/esp32c3_wlan.h
similarity index 93%
rename from arch/risc-v/src/esp32c3/esp32c3_wlan.h
rename to arch/risc-v/src/esp32c3-legacy/esp32c3_wlan.h
index 029aff1b0e5..7d649946dfb 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_wlan.h
+++ b/arch/risc-v/src/esp32c3-legacy/esp32c3_wlan.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/src/esp32c3/esp32c3_wlan.h
+ * arch/risc-v/src/esp32c3-legacy/esp32c3_wlan.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_SRC_ESP32C3_ESP32C3_WLAN_H
-#define __ARCH_RISCV_SRC_ESP32C3_ESP32C3_WLAN_H
+#ifndef __ARCH_RISCV_SRC_ESP32C3_LEGACY_ESP32C3_WLAN_H
+#define __ARCH_RISCV_SRC_ESP32C3_LEGACY_ESP32C3_WLAN_H
 
 /****************************************************************************
  * Included Files
@@ -108,4 +108,4 @@ int esp32c3_wlan_softap_initialize(void);
 #undef EXTERN
 
 #endif /* __ASSEMBLY__ */
-#endif /* __ARCH_RISCV_SRC_ESP32C3_ESP32C3_WLAN_H */
+#endif /* __ARCH_RISCV_SRC_ESP32C3_LEGACY_ESP32C3_WLAN_H */
diff --git a/arch/risc-v/src/esp32c3/hardware/apb_ctrl_reg.h b/arch/risc-v/src/esp32c3-legacy/hardware/apb_ctrl_reg.h
similarity index 92%
rename from arch/risc-v/src/esp32c3/hardware/apb_ctrl_reg.h
rename to arch/risc-v/src/esp32c3-legacy/hardware/apb_ctrl_reg.h
index 88549e04b77..21467bbddb8 100644
--- a/arch/risc-v/src/esp32c3/hardware/apb_ctrl_reg.h
+++ b/arch/risc-v/src/esp32c3-legacy/hardware/apb_ctrl_reg.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/src/esp32c3/hardware/apb_ctrl_reg.h
+ * arch/risc-v/src/esp32c3-legacy/hardware/apb_ctrl_reg.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_SRC_ESP32C3_HARDWARE_APB_CTRL_REG_H
-#define __ARCH_RISCV_SRC_ESP32C3_HARDWARE_APB_CTRL_REG_H
+#ifndef __ARCH_RISCV_SRC_ESP32C3_LEGACY_HARDWARE_APB_CTRL_REG_H
+#define __ARCH_RISCV_SRC_ESP32C3_LEGACY_HARDWARE_APB_CTRL_REG_H
 
 /****************************************************************************
  * Included Files
@@ -79,4 +79,4 @@
 #define APB_CTRL_RETENTION_LINK_ADDR_V  0x7FFFFFF
 #define APB_CTRL_RETENTION_LINK_ADDR_S  0
 
-#endif /* __ARCH_RISCV_SRC_ESP32C3_HARDWARE_APB_CTRL_REG_H */
+#endif /* __ARCH_RISCV_SRC_ESP32C3_LEGACY_HARDWARE_APB_CTRL_REG_H */
diff --git a/arch/risc-v/src/esp32c3/hardware/bb_reg.h b/arch/risc-v/src/esp32c3-legacy/hardware/bb_reg.h
similarity index 88%
rename from arch/risc-v/src/esp32c3/hardware/bb_reg.h
rename to arch/risc-v/src/esp32c3-legacy/hardware/bb_reg.h
index d74bc01d442..ad0164844d3 100644
--- a/arch/risc-v/src/esp32c3/hardware/bb_reg.h
+++ b/arch/risc-v/src/esp32c3-legacy/hardware/bb_reg.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/src/esp32c3/hardware/bb_reg.h
+ * arch/risc-v/src/esp32c3-legacy/hardware/bb_reg.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_SRC_ESP32C3_HARDWARE_BB_REG_H
-#define __ARCH_RISCV_SRC_ESP32C3_HARDWARE_BB_REG_H
+#ifndef __ARCH_RISCV_SRC_ESP32C3_LEGACY_HARDWARE_BB_REG_H
+#define __ARCH_RISCV_SRC_ESP32C3_LEGACY_HARDWARE_BB_REG_H
 
 /****************************************************************************
  * Included Files
@@ -46,4 +46,4 @@
 #define BB_DC_EST_FORCE_PU_V 1
 #define BB_DC_EST_FORCE_PU_S 1
 
-#endif /* __ARCH_RISCV_SRC_ESP32C3_HARDWARE_BB_REG_H */
+#endif /* __ARCH_RISCV_SRC_ESP32C3_LEGACY_HARDWARE_BB_REG_H */
diff --git a/arch/risc-v/src/esp32c3/hardware/esp32c3_aes.h b/arch/risc-v/src/esp32c3-legacy/hardware/esp32c3_aes.h
similarity index 98%
rename from arch/risc-v/src/esp32c3/hardware/esp32c3_aes.h
rename to arch/risc-v/src/esp32c3-legacy/hardware/esp32c3_aes.h
index ee1034b9150..7e1e6bfc4b3 100644
--- a/arch/risc-v/src/esp32c3/hardware/esp32c3_aes.h
+++ b/arch/risc-v/src/esp32c3-legacy/hardware/esp32c3_aes.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/src/esp32c3/hardware/esp32c3_aes.h
+ * arch/risc-v/src/esp32c3-legacy/hardware/esp32c3_aes.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_SRC_ESP32C3_HARDWARE_ESP32C3_AES_H
-#define __ARCH_RISCV_SRC_ESP32C3_HARDWARE_ESP32C3_AES_H
+#ifndef __ARCH_RISCV_SRC_ESP32C3_LEGACY_HARDWARE_ESP32C3_AES_H
+#define __ARCH_RISCV_SRC_ESP32C3_LEGACY_HARDWARE_ESP32C3_AES_H
 
 /****************************************************************************
  * Included Files
@@ -777,4 +777,4 @@
 #define AES_DMA_EXIT_V  0x00000001
 #define AES_DMA_EXIT_S  0
 
-#endif /* __ARCH_RISCV_SRC_ESP32C3_HARDWARE_ESP32C3_AES_H */
+#endif /* __ARCH_RISCV_SRC_ESP32C3_LEGACY_HARDWARE_ESP32C3_AES_H */
diff --git a/arch/risc-v/src/esp32c3/hardware/esp32c3_cache_memory.h b/arch/risc-v/src/esp32c3-legacy/hardware/esp32c3_cache_memory.h
similarity index 93%
rename from arch/risc-v/src/esp32c3/hardware/esp32c3_cache_memory.h
rename to arch/risc-v/src/esp32c3-legacy/hardware/esp32c3_cache_memory.h
index 1a6e52968e8..51484d3419c 100644
--- a/arch/risc-v/src/esp32c3/hardware/esp32c3_cache_memory.h
+++ b/arch/risc-v/src/esp32c3-legacy/hardware/esp32c3_cache_memory.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/src/esp32c3/hardware/esp32c3_cache_memory.h
+ * arch/risc-v/src/esp32c3-legacy/hardware/esp32c3_cache_memory.h
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,8 +15,8 @@
  *
  ****************************************************************************/
 
-#ifndef __ARCH_RISCV_SRC_ESP32C3_HARDWARE_ESP32C3_CACHE_MEMORY_H
-#define __ARCH_RISCV_SRC_ESP32C3_HARDWARE_ESP32C3_CACHE_MEMORY_H
+#ifndef __ARCH_RISCV_SRC_ESP32C3_LEGACY_HARDWARE_ESP32C3_CACHE_MEMORY_H
+#define __ARCH_RISCV_SRC_ESP32C3_LEGACY_HARDWARE_ESP32C3_CACHE_MEMORY_H
 
 /****************************************************************************
  * Included Files
@@ -107,4 +107,4 @@
 
 #define CACHE_MEMORY_IBANK0_ADDR    0x4037c000
 
-#endif /* __ARCH_RISCV_SRC_ESP32C3_HARDWARE_ESP32C3_CACHE_MEMORY_H */
+#endif /* __ARCH_RISCV_SRC_ESP32C3_LEGACY_HARDWARE_ESP32C3_CACHE_MEMORY_H */
diff --git a/arch/risc-v/src/esp32c3/hardware/esp32c3_dma.h b/arch/risc-v/src/esp32c3-legacy/hardware/esp32c3_dma.h
similarity index 99%
rename from arch/risc-v/src/esp32c3/hardware/esp32c3_dma.h
rename to arch/risc-v/src/esp32c3-legacy/hardware/esp32c3_dma.h
index 78b5746d34f..a31fb4845fe 100644
--- a/arch/risc-v/src/esp32c3/hardware/esp32c3_dma.h
+++ b/arch/risc-v/src/esp32c3-legacy/hardware/esp32c3_dma.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/src/esp32c3/hardware/esp32c3_dma.h
+ * arch/risc-v/src/esp32c3-legacy/hardware/esp32c3_dma.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_SRC_ESP32C3_HARDWARE_ESP32C3_DMA_H
-#define __ARCH_RISCV_SRC_ESP32C3_HARDWARE_ESP32C3_DMA_H
+#ifndef __ARCH_RISCV_SRC_ESP32C3_LEGACY_HARDWARE_ESP32C3_DMA_H
+#define __ARCH_RISCV_SRC_ESP32C3_LEGACY_HARDWARE_ESP32C3_DMA_H
 
 /****************************************************************************
  * Included Files
@@ -3895,4 +3895,4 @@
 #define DMA_PERI_OUT_SEL_CH2_V  0x0000003F
 #define DMA_PERI_OUT_SEL_CH2_S  0
 
-#endif /* __ARCH_RISCV_SRC_ESP32C3_HARDWARE_ESP32C3_DMA_H */
+#endif /* __ARCH_RISCV_SRC_ESP32C3_LEGACY_HARDWARE_ESP32C3_DMA_H */
diff --git a/arch/risc-v/src/esp32c3/hardware/esp32c3_efuse.h b/arch/risc-v/src/esp32c3-legacy/hardware/esp32c3_efuse.h
similarity index 99%
rename from arch/risc-v/src/esp32c3/hardware/esp32c3_efuse.h
rename to arch/risc-v/src/esp32c3-legacy/hardware/esp32c3_efuse.h
index ef92134a3d4..dd0076fb2f2 100644
--- a/arch/risc-v/src/esp32c3/hardware/esp32c3_efuse.h
+++ b/arch/risc-v/src/esp32c3-legacy/hardware/esp32c3_efuse.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/src/esp32c3/hardware/esp32c3_efuse.h
+ * arch/risc-v/src/esp32c3-legacy/hardware/esp32c3_efuse.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_SRC_ESP32C3_HARDWARE_ESP32C3_EFUSE_H
-#define __ARCH_RISCV_SRC_ESP32C3_HARDWARE_ESP32C3_EFUSE_H
+#ifndef __ARCH_RISCV_SRC_ESP32C3_LEGACY_HARDWARE_ESP32C3_EFUSE_H
+#define __ARCH_RISCV_SRC_ESP32C3_LEGACY_HARDWARE_ESP32C3_EFUSE_H
 
 /****************************************************************************
  * Included Files
@@ -3279,4 +3279,4 @@
 #define EFUSE_EFUSE_DATE_V  0xFFFFFFFF
 #define EFUSE_EFUSE_DATE_S  0
 
-#endif /* __ARCH_RISCV_SRC_ESP32C3_HARDWARE_ESP32C3_EFUSE_H */
+#endif /* __ARCH_RISCV_SRC_ESP32C3_LEGACY_HARDWARE_ESP32C3_EFUSE_H */
diff --git a/arch/risc-v/src/esp32c3/hardware/esp32c3_gpio.h b/arch/risc-v/src/esp32c3-legacy/hardware/esp32c3_gpio.h
similarity index 99%
rename from arch/risc-v/src/esp32c3/hardware/esp32c3_gpio.h
rename to arch/risc-v/src/esp32c3-legacy/hardware/esp32c3_gpio.h
index 588ed1bd7b4..98ae5195024 100644
--- a/arch/risc-v/src/esp32c3/hardware/esp32c3_gpio.h
+++ b/arch/risc-v/src/esp32c3-legacy/hardware/esp32c3_gpio.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/src/esp32c3/hardware/esp32c3_gpio.h
+ * arch/risc-v/src/esp32c3-legacy/hardware/esp32c3_gpio.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_SRC_ESP32C3_HARDWARE_ESP32C3_GPIO_H
-#define __ARCH_RISCV_SRC_ESP32C3_HARDWARE_ESP32C3_GPIO_H
+#ifndef __ARCH_RISCV_SRC_ESP32C3_LEGACY_HARDWARE_ESP32C3_GPIO_H
+#define __ARCH_RISCV_SRC_ESP32C3_LEGACY_HARDWARE_ESP32C3_GPIO_H
 
 /****************************************************************************
  * Included Files
@@ -5311,4 +5311,4 @@
 #define GPIO_DATE_V  0xfffffff
 #define GPIO_DATE_S  0
 
-#endif /* __ARCH_RISCV_SRC_ESP32C3_HARDWARE_ESP32C3_GPIO_H */
+#endif /* __ARCH_RISCV_SRC_ESP32C3_LEGACY_HARDWARE_ESP32C3_GPIO_H */
diff --git a/arch/risc-v/src/esp32c3/hardware/esp32c3_gpio_sigmap.h b/arch/risc-v/src/esp32c3-legacy/hardware/esp32c3_gpio_sigmap.h
similarity index 96%
rename from arch/risc-v/src/esp32c3/hardware/esp32c3_gpio_sigmap.h
rename to arch/risc-v/src/esp32c3-legacy/hardware/esp32c3_gpio_sigmap.h
index 17dc40e8de9..19bb79905c5 100644
--- a/arch/risc-v/src/esp32c3/hardware/esp32c3_gpio_sigmap.h
+++ b/arch/risc-v/src/esp32c3-legacy/hardware/esp32c3_gpio_sigmap.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/src/esp32c3/hardware/esp32c3_gpio_sigmap.h
+ * arch/risc-v/src/esp32c3-legacy/hardware/esp32c3_gpio_sigmap.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_SRC_ESP32C3_HARDWARE_ESP32C3_GPIO_SIGMAP_H
-#define __ARCH_RISCV_SRC_ESP32C3_HARDWARE_ESP32C3_GPIO_SIGMAP_H
+#ifndef __ARCH_RISCV_SRC_ESP32C3_LEGACY_HARDWARE_ESP32C3_GPIO_SIGMAP_H
+#define __ARCH_RISCV_SRC_ESP32C3_LEGACY_HARDWARE_ESP32C3_GPIO_SIGMAP_H
 
 /****************************************************************************
  * Pre-processor Definitions
@@ -193,4 +193,4 @@
 #define SIG_GPIO_OUT_IDX              128
 #define GPIO_MAP_DATE_IDX             0x2006130
 
-#endif  /* __ARCH_RISCV_SRC_ESP32C3_HARDWARE_ESP32C3_GPIO_SIGMAP_H */
+#endif  /* __ARCH_RISCV_SRC_ESP32C3_LEGACY_HARDWARE_ESP32C3_GPIO_SIGMAP_H */
diff --git a/arch/risc-v/src/esp32c3/hardware/esp32c3_i2c.h b/arch/risc-v/src/esp32c3-legacy/hardware/esp32c3_i2c.h
similarity index 99%
rename from arch/risc-v/src/esp32c3/hardware/esp32c3_i2c.h
rename to arch/risc-v/src/esp32c3-legacy/hardware/esp32c3_i2c.h
index 2874aaac2ee..3552e17b872 100644
--- a/arch/risc-v/src/esp32c3/hardware/esp32c3_i2c.h
+++ b/arch/risc-v/src/esp32c3-legacy/hardware/esp32c3_i2c.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/src/esp32c3/hardware/esp32c3_i2c.h
+ * arch/risc-v/src/esp32c3-legacy/hardware/esp32c3_i2c.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_SRC_ESP32C3_HARDWARE_ESP32C3_I2C_H
-#define __ARCH_RISCV_SRC_ESP32C3_HARDWARE_ESP32C3_I2C_H
+#ifndef __ARCH_RISCV_SRC_ESP32C3_LEGACY_HARDWARE_ESP32C3_I2C_H
+#define __ARCH_RISCV_SRC_ESP32C3_LEGACY_HARDWARE_ESP32C3_I2C_H
 
 /****************************************************************************
  * Included Files
@@ -1223,4 +1223,4 @@
 
 #define I2C_RXFIFO_START_ADDR_REG(i)          (REG_I2C_BASE(i) + 0x180)
 
-#endif /* __ARCH_RISCV_SRC_ESP32C3_HARDWARE_ESP32C3_I2C_H */
+#endif /* __ARCH_RISCV_SRC_ESP32C3_LEGACY_HARDWARE_ESP32C3_I2C_H */
diff --git a/arch/risc-v/src/esp32c3/hardware/esp32c3_interrupt.h b/arch/risc-v/src/esp32c3-legacy/hardware/esp32c3_interrupt.h
similarity index 99%
rename from arch/risc-v/src/esp32c3/hardware/esp32c3_interrupt.h
rename to arch/risc-v/src/esp32c3-legacy/hardware/esp32c3_interrupt.h
index 675a584e4c3..b776802f454 100644
--- a/arch/risc-v/src/esp32c3/hardware/esp32c3_interrupt.h
+++ b/arch/risc-v/src/esp32c3-legacy/hardware/esp32c3_interrupt.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/src/esp32c3/hardware/esp32c3_interrupt.h
+ * arch/risc-v/src/esp32c3-legacy/hardware/esp32c3_interrupt.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_SRC_ESP32C3_HARDWARE_ESP32C3_INTERRUPT_H
-#define __ARCH_RISCV_SRC_ESP32C3_HARDWARE_ESP32C3_INTERRUPT_H
+#ifndef __ARCH_RISCV_SRC_ESP32C3_LEGACY_HARDWARE_ESP32C3_INTERRUPT_H
+#define __ARCH_RISCV_SRC_ESP32C3_LEGACY_HARDWARE_ESP32C3_INTERRUPT_H
 
 /****************************************************************************
  * Included Files
@@ -959,4 +959,4 @@
 #define INTERRUPT_INTERRUPT_DATE_V  0xfffffff
 #define INTERRUPT_INTERRUPT_DATE_S  0
 
-#endif /* __ARCH_RISCV_SRC_ESP32C3_HARDWARE_ESP32C3_INTERRUPT_H */
+#endif /* __ARCH_RISCV_SRC_ESP32C3_LEGACY_HARDWARE_ESP32C3_INTERRUPT_H */
diff --git a/arch/risc-v/src/esp32c3/hardware/esp32c3_iomux.h b/arch/risc-v/src/esp32c3-legacy/hardware/esp32c3_iomux.h
similarity index 97%
rename from arch/risc-v/src/esp32c3/hardware/esp32c3_iomux.h
rename to arch/risc-v/src/esp32c3-legacy/hardware/esp32c3_iomux.h
index f3c4f29d114..b75eb46c218 100644
--- a/arch/risc-v/src/esp32c3/hardware/esp32c3_iomux.h
+++ b/arch/risc-v/src/esp32c3-legacy/hardware/esp32c3_iomux.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/src/esp32c3/hardware/esp32c3_iomux.h
+ * arch/risc-v/src/esp32c3-legacy/hardware/esp32c3_iomux.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_SRC_ESP32C3_HARDWARE_ESP32C3_IOMUX_H
-#define __ARCH_RISCV_SRC_ESP32C3_HARDWARE_ESP32C3_IOMUX_H
+#ifndef __ARCH_RISCV_SRC_ESP32C3_LEGACY_HARDWARE_ESP32C3_IOMUX_H
+#define __ARCH_RISCV_SRC_ESP32C3_LEGACY_HARDWARE_ESP32C3_IOMUX_H
 
 /****************************************************************************
  * Included Files
@@ -307,4 +307,4 @@
 #define IO_MUX_DATE_S 0
 #define IO_MUX_DATE_VERSION 0x2006050
 
-#endif /* __ARCH_RISCV_SRC_ESP32C3_HARDWARE_ESP32C3_IOMUX_H */
+#endif /* __ARCH_RISCV_SRC_ESP32C3_LEGACY_HARDWARE_ESP32C3_IOMUX_H */
diff --git a/arch/risc-v/src/esp32c3/hardware/esp32c3_ledc.h b/arch/risc-v/src/esp32c3-legacy/hardware/esp32c3_ledc.h
similarity index 99%
rename from arch/risc-v/src/esp32c3/hardware/esp32c3_ledc.h
rename to arch/risc-v/src/esp32c3-legacy/hardware/esp32c3_ledc.h
index 6b8846b75be..7fa402cd582 100644
--- a/arch/risc-v/src/esp32c3/hardware/esp32c3_ledc.h
+++ b/arch/risc-v/src/esp32c3-legacy/hardware/esp32c3_ledc.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/src/esp32c3/hardware/esp32c3_ledc.h
+ * arch/risc-v/src/esp32c3-legacy/hardware/esp32c3_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 __ARCH_RISCV_SRC_ESP32C3_HARDWARE_ESP32C3_LEDC_H
-#define __ARCH_RISCV_SRC_ESP32C3_HARDWARE_ESP32C3_LEDC_H
+#ifndef __ARCH_RISCV_SRC_ESP32C3_LEGACY_HARDWARE_ESP32C3_LEDC_H
+#define __ARCH_RISCV_SRC_ESP32C3_LEGACY_HARDWARE_ESP32C3_LEDC_H
 
 /****************************************************************************
  * Included Files
@@ -2739,4 +2739,4 @@
 #define LEDC_DATE_V  0xFFFFFFFF
 #define LEDC_DATE_S  0
 
-#endif /* __ARCH_RISCV_SRC_ESP32C3_HARDWARE_ESP32C3_LEDC_H */
+#endif /* __ARCH_RISCV_SRC_ESP32C3_LEGACY_HARDWARE_ESP32C3_LEDC_H */
diff --git a/arch/risc-v/src/esp32c3/hardware/esp32c3_memorymap.h b/arch/risc-v/src/esp32c3-legacy/hardware/esp32c3_memorymap.h
similarity index 93%
rename from arch/risc-v/src/esp32c3/hardware/esp32c3_memorymap.h
rename to arch/risc-v/src/esp32c3-legacy/hardware/esp32c3_memorymap.h
index c9cf552438a..a8bc4e34297 100644
--- a/arch/risc-v/src/esp32c3/hardware/esp32c3_memorymap.h
+++ b/arch/risc-v/src/esp32c3-legacy/hardware/esp32c3_memorymap.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/src/esp32c3/hardware/esp32c3_memorymap.h
+ * arch/risc-v/src/esp32c3-legacy/hardware/esp32c3_memorymap.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_SRC_ESP32C3_HARDWARE_ESP32C3_MEMORYMAP_H
-#define __ARCH_RISCV_SRC_ESP32C3_HARDWARE_ESP32C3_MEMORYMAP_H
+#ifndef __ARCH_RISCV_SRC_ESP32C3_LEGACY_HARDWARE_ESP32C3_MEMORYMAP_H
+#define __ARCH_RISCV_SRC_ESP32C3_LEGACY_HARDWARE_ESP32C3_MEMORYMAP_H
 
 /****************************************************************************
  * Pre-processor Definitions
@@ -69,4 +69,4 @@
 #define ESP32C3_APB_SARADC_BASE                  0x60040000
 #define ESP32C3_AES_XTS_BASE                     0x600cc000
 
-#endif /* __ARCH_RISCV_SRC_ESP32C3_HARDWARE_ESP32C3_MEMORYMAP_H */
+#endif /* __ARCH_RISCV_SRC_ESP32C3_LEGACY_HARDWARE_ESP32C3_MEMORYMAP_H */
diff --git a/arch/risc-v/src/esp32c3/hardware/esp32c3_pinmap.h b/arch/risc-v/src/esp32c3-legacy/hardware/esp32c3_pinmap.h
similarity index 86%
rename from arch/risc-v/src/esp32c3/hardware/esp32c3_pinmap.h
rename to arch/risc-v/src/esp32c3-legacy/hardware/esp32c3_pinmap.h
index 54465ecdc58..febe9eccd0a 100644
--- a/arch/risc-v/src/esp32c3/hardware/esp32c3_pinmap.h
+++ b/arch/risc-v/src/esp32c3-legacy/hardware/esp32c3_pinmap.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/src/esp32c3/hardware/esp32c3_pinmap.h
+ * arch/risc-v/src/esp32c3-legacy/hardware/esp32c3_pinmap.h
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -22,8 +22,8 @@
  * Included Files
  ****************************************************************************/
 
-#ifndef __ARCH_RISCV_SRC_ESP32C3_HARDWARE_ESP32C3_PINMAP_H
-#define __ARCH_RISCV_SRC_ESP32C3_HARDWARE_ESP32C3_PINMAP_H
+#ifndef __ARCH_RISCV_SRC_ESP32C3_LEGACY_HARDWARE_ESP32C3_PINMAP_H
+#define __ARCH_RISCV_SRC_ESP32C3_LEGACY_HARDWARE_ESP32C3_PINMAP_H
 
 /****************************************************************************
  * Pre-processor Definitions
@@ -42,4 +42,4 @@
 #define SPI2_IOMUX_WPPIN        (5)
 #define SPI2_IOMUX_HDPIN        (4)
 
-#endif /* __ARCH_RISCV_SRC_ESP32C3_HARDWARE_ESP32C3_PINMAP_H */
+#endif /* __ARCH_RISCV_SRC_ESP32C3_LEGACY_HARDWARE_ESP32C3_PINMAP_H */
diff --git a/arch/risc-v/src/esp32c3/hardware/esp32c3_rom_layout.h b/arch/risc-v/src/esp32c3-legacy/hardware/esp32c3_rom_layout.h
similarity index 91%
rename from arch/risc-v/src/esp32c3/hardware/esp32c3_rom_layout.h
rename to arch/risc-v/src/esp32c3-legacy/hardware/esp32c3_rom_layout.h
index f7a7e6b5754..560b22d03d2 100644
--- a/arch/risc-v/src/esp32c3/hardware/esp32c3_rom_layout.h
+++ b/arch/risc-v/src/esp32c3-legacy/hardware/esp32c3_rom_layout.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/src/esp32c3/hardware/esp32c3_rom_layout.h
+ * arch/risc-v/src/esp32c3-legacy/hardware/esp32c3_rom_layout.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_SRC_ESP32C3_HARDWARE_ESP32C3_ROM_LAYOUT_H
-#define __ARCH_RISCV_SRC_ESP32C3_HARDWARE_ESP32C3_ROM_LAYOUT_H
+#ifndef __ARCH_RISCV_SRC_ESP32C3_LEGACY_HARDWARE_ESP32C3_ROM_LAYOUT_H
+#define __ARCH_RISCV_SRC_ESP32C3_LEGACY_HARDWARE_ESP32C3_ROM_LAYOUT_H
 
 /****************************************************************************
  * Included Files
@@ -90,5 +90,5 @@ struct esp32c3_rom_layout_s
   uintptr_t dram_end_uart_rom;
 };
 
-#endif /* __ARCH_RISCV_SRC_ESP32C3_HARDWARE_ESP32C3_ROM_LAYOUT_H */
+#endif /* __ARCH_RISCV_SRC_ESP32C3_LEGACY_HARDWARE_ESP32C3_ROM_LAYOUT_H */
 
diff --git a/arch/risc-v/src/esp32c3/hardware/esp32c3_rsa.h b/arch/risc-v/src/esp32c3-legacy/hardware/esp32c3_rsa.h
similarity index 97%
rename from arch/risc-v/src/esp32c3/hardware/esp32c3_rsa.h
rename to arch/risc-v/src/esp32c3-legacy/hardware/esp32c3_rsa.h
index e11582c7f3e..162f5863875 100644
--- a/arch/risc-v/src/esp32c3/hardware/esp32c3_rsa.h
+++ b/arch/risc-v/src/esp32c3-legacy/hardware/esp32c3_rsa.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/src/esp32c3/hardware/esp32c3_rsa.h
+ * arch/risc-v/src/esp32c3-legacy/hardware/esp32c3_rsa.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_SRC_ESP32C3_HARDWARE_ESP32C3_RSA_H
-#define __ARCH_RISCV_SRC_ESP32C3_HARDWARE_ESP32C3_RSA_H
+#ifndef __ARCH_RISCV_SRC_ESP32C3_LEGACY_HARDWARE_ESP32C3_RSA_H
+#define __ARCH_RISCV_SRC_ESP32C3_LEGACY_HARDWARE_ESP32C3_RSA_H
 
 /****************************************************************************
  * Included Files
@@ -305,4 +305,4 @@
 #define RSA_DATE_V  0x3FFFFFFF
 #define RSA_DATE_S  0
 
-#endif /* __ARCH_RISCV_SRC_ESP32C3_HARDWARE_ESP32C3_RSA_H */
+#endif /* __ARCH_RISCV_SRC_ESP32C3_LEGACY_HARDWARE_ESP32C3_RSA_H */
diff --git a/arch/risc-v/src/esp32c3/hardware/esp32c3_rtccntl.h b/arch/risc-v/src/esp32c3-legacy/hardware/esp32c3_rtccntl.h
similarity index 99%
rename from arch/risc-v/src/esp32c3/hardware/esp32c3_rtccntl.h
rename to arch/risc-v/src/esp32c3-legacy/hardware/esp32c3_rtccntl.h
index f43aaa794bb..0905977844a 100644
--- a/arch/risc-v/src/esp32c3/hardware/esp32c3_rtccntl.h
+++ b/arch/risc-v/src/esp32c3-legacy/hardware/esp32c3_rtccntl.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/src/esp32c3/hardware/esp32c3_rtccntl.h
+ * arch/risc-v/src/esp32c3-legacy/hardware/esp32c3_rtccntl.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_SRC_ESP32C3_HARDWARE_ESP32C3_RTCCNTL_H
-#define __ARCH_RISCV_SRC_ESP32C3_HARDWARE_ESP32C3_RTCCNTL_H
+#ifndef __ARCH_RISCV_SRC_ESP32C3_LEGACY_HARDWARE_ESP32C3_RTCCNTL_H
+#define __ARCH_RISCV_SRC_ESP32C3_LEGACY_HARDWARE_ESP32C3_RTCCNTL_H
 
 /****************************************************************************
  * Included Files
@@ -3624,4 +3624,4 @@
 #define RTC_RESET_CAUSE_REG     RTC_CNTL_STORE6_REG
 #define RTC_MEMORY_CRC_REG      RTC_CNTL_STORE7_REG
 
-#endif /* __ARCH_RISCV_SRC_ESP32C3_HARDWARE_ESP32C3_RTCCNTL_H */
+#endif /* __ARCH_RISCV_SRC_ESP32C3_LEGACY_HARDWARE_ESP32C3_RTCCNTL_H */
diff --git a/arch/risc-v/src/esp32c3/hardware/esp32c3_saradc.h b/arch/risc-v/src/esp32c3-legacy/hardware/esp32c3_saradc.h
similarity index 99%
rename from arch/risc-v/src/esp32c3/hardware/esp32c3_saradc.h
rename to arch/risc-v/src/esp32c3-legacy/hardware/esp32c3_saradc.h
index 3d6a281e1c3..edd6da0bc7f 100644
--- a/arch/risc-v/src/esp32c3/hardware/esp32c3_saradc.h
+++ b/arch/risc-v/src/esp32c3-legacy/hardware/esp32c3_saradc.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/src/esp32c3/hardware/esp32c3_saradc.h
+ * arch/risc-v/src/esp32c3-legacy/hardware/esp32c3_saradc.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_SRC_ESP32C3_HARDWARE_ESP32C3_SARADC_H
-#define __ARCH_RISCV_SRC_ESP32C3_HARDWARE_ESP32C3_SARADC_H
+#ifndef __ARCH_RISCV_SRC_ESP32C3_LEGACY_HARDWARE_ESP32C3_SARADC_H
+#define __ARCH_RISCV_SRC_ESP32C3_LEGACY_HARDWARE_ESP32C3_SARADC_H
 
 /****************************************************************************
  * Included Files
@@ -909,4 +909,4 @@
 #define APB_SARADC_DATE_V  0xFFFFFFFF
 #define APB_SARADC_DATE_S  0
 
-#endif /* __ARCH_RISCV_SRC_ESP32C3_HARDWARE_ESP32C3_SARADC_H */
+#endif /* __ARCH_RISCV_SRC_ESP32C3_LEGACY_HARDWARE_ESP32C3_SARADC_H */
diff --git a/arch/risc-v/src/esp32c3/hardware/esp32c3_sha.h b/arch/risc-v/src/esp32c3-legacy/hardware/esp32c3_sha.h
similarity index 98%
rename from arch/risc-v/src/esp32c3/hardware/esp32c3_sha.h
rename to arch/risc-v/src/esp32c3-legacy/hardware/esp32c3_sha.h
index f4d81898342..d4d1383475c 100644
--- a/arch/risc-v/src/esp32c3/hardware/esp32c3_sha.h
+++ b/arch/risc-v/src/esp32c3-legacy/hardware/esp32c3_sha.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/src/esp32c3/hardware/esp32c3_sha.h
+ * arch/risc-v/src/esp32c3-legacy/hardware/esp32c3_sha.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_SRC_ESP32C3_HARDWARE_ESP32C3_SHA_H
-#define __ARCH_RISCV_SRC_ESP32C3_HARDWARE_ESP32C3_SHA_H
+#ifndef __ARCH_RISCV_SRC_ESP32C3_LEGACY_HARDWARE_ESP32C3_SHA_H
+#define __ARCH_RISCV_SRC_ESP32C3_LEGACY_HARDWARE_ESP32C3_SHA_H
 
 /****************************************************************************
  * Included Files
@@ -935,4 +935,4 @@
 #define SHA_M_31_V  0xFFFFFFFF
 #define SHA_M_31_S  0
 
-#endif /* __ARCH_RISCV_SRC_ESP32C3_HARDWARE_ESP32C3_SHA_H */
+#endif /* __ARCH_RISCV_SRC_ESP32C3_LEGACY_HARDWARE_ESP32C3_SHA_H */
diff --git a/arch/risc-v/src/esp32c3/hardware/esp32c3_soc.h b/arch/risc-v/src/esp32c3-legacy/hardware/esp32c3_soc.h
similarity index 98%
rename from arch/risc-v/src/esp32c3/hardware/esp32c3_soc.h
rename to arch/risc-v/src/esp32c3-legacy/hardware/esp32c3_soc.h
index ead5c1f7c5a..4cf63e67372 100644
--- a/arch/risc-v/src/esp32c3/hardware/esp32c3_soc.h
+++ b/arch/risc-v/src/esp32c3-legacy/hardware/esp32c3_soc.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/src/esp32c3/hardware/esp32c3_soc.h
+ * arch/risc-v/src/esp32c3-legacy/hardware/esp32c3_soc.h
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,8 +15,8 @@
  *
  ****************************************************************************/
 
-#ifndef __ARCH_RISCV_SRC_ESP32C3_HARDWARE_ESP32C3_SOC_H
-#define __ARCH_RISCV_SRC_ESP32C3_HARDWARE_ESP32C3_SOC_H
+#ifndef __ARCH_RISCV_SRC_ESP32C3_LEGACY_HARDWARE_ESP32C3_SOC_H
+#define __ARCH_RISCV_SRC_ESP32C3_LEGACY_HARDWARE_ESP32C3_SOC_H
 
 /****************************************************************************
  * Included Files
@@ -326,4 +326,4 @@ static inline bool IRAM_ATTR esp32c3_ptr_rtc(const void *p)
           (intptr_t)p < SOC_RTC_RAM_HIGH);
 }
 
-#endif /* __ARCH_RISCV_SRC_ESP32C3_HARDWARE_ESP32C3_SOC_H */
+#endif /* __ARCH_RISCV_SRC_ESP32C3_LEGACY_HARDWARE_ESP32C3_SOC_H */
diff --git a/arch/risc-v/src/esp32c3/hardware/esp32c3_spi.h b/arch/risc-v/src/esp32c3-legacy/hardware/esp32c3_spi.h
similarity index 99%
rename from arch/risc-v/src/esp32c3/hardware/esp32c3_spi.h
rename to arch/risc-v/src/esp32c3-legacy/hardware/esp32c3_spi.h
index 9b4a021163b..f765015f144 100644
--- a/arch/risc-v/src/esp32c3/hardware/esp32c3_spi.h
+++ b/arch/risc-v/src/esp32c3-legacy/hardware/esp32c3_spi.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/src/esp32c3/hardware/esp32c3_spi.h
+ * arch/risc-v/src/esp32c3-legacy/hardware/esp32c3_spi.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_SRC_ESP32C3_HARDWARE_ESP32C3_SPI_H
-#define __ARCH_RISCV_SRC_ESP32C3_HARDWARE_ESP32C3_SPI_H
+#ifndef __ARCH_RISCV_SRC_ESP32C3_LEGACY_HARDWARE_ESP32C3_SPI_H
+#define __ARCH_RISCV_SRC_ESP32C3_LEGACY_HARDWARE_ESP32C3_SPI_H
 
 /****************************************************************************
  * Included Files
@@ -2211,4 +2211,4 @@
 #define SPI_DATE_V  0x0FFFFFFF
 #define SPI_DATE_S  0
 
-#endif /* __ARCH_RISCV_SRC_ESP32C3_HARDWARE_ESP32C3_SPI_H */
+#endif /* __ARCH_RISCV_SRC_ESP32C3_LEGACY_HARDWARE_ESP32C3_SPI_H */
diff --git a/arch/risc-v/src/esp32c3/hardware/esp32c3_syscon.h b/arch/risc-v/src/esp32c3-legacy/hardware/esp32c3_syscon.h
similarity index 98%
rename from arch/risc-v/src/esp32c3/hardware/esp32c3_syscon.h
rename to arch/risc-v/src/esp32c3-legacy/hardware/esp32c3_syscon.h
index c7cf6b24b7b..01a46aab894 100644
--- a/arch/risc-v/src/esp32c3/hardware/esp32c3_syscon.h
+++ b/arch/risc-v/src/esp32c3-legacy/hardware/esp32c3_syscon.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/src/esp32c3/hardware/esp32c3_syscon.h
+ * arch/risc-v/src/esp32c3-legacy/hardware/esp32c3_syscon.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_SRC_ESP32C3_HARDWARE_ESP32C3_SYSCON_H
-#define __ARCH_RISCV_SRC_ESP32C3_HARDWARE_ESP32C3_SYSCON_H
+#ifndef __ARCH_RISCV_SRC_ESP32C3_LEGACY_HARDWARE_ESP32C3_SYSCON_H
+#define __ARCH_RISCV_SRC_ESP32C3_LEGACY_HARDWARE_ESP32C3_SYSCON_H
 
 /****************************************************************************
  * Included Files
@@ -639,4 +639,4 @@
 #define SYSCON_DATE_V 0xFFFFFFFF
 #define SYSCON_DATE_S 0
 
-#endif /* __ARCH_RISCV_SRC_ESP32C3_HARDWARE_ESP32C3_SYSCON_H */
+#endif /* __ARCH_RISCV_SRC_ESP32C3_LEGACY_HARDWARE_ESP32C3_SYSCON_H */
diff --git a/arch/risc-v/src/esp32c3/hardware/esp32c3_system.h b/arch/risc-v/src/esp32c3-legacy/hardware/esp32c3_system.h
similarity index 99%
rename from arch/risc-v/src/esp32c3/hardware/esp32c3_system.h
rename to arch/risc-v/src/esp32c3-legacy/hardware/esp32c3_system.h
index 34ede266fb3..1b49d6b56fa 100644
--- a/arch/risc-v/src/esp32c3/hardware/esp32c3_system.h
+++ b/arch/risc-v/src/esp32c3-legacy/hardware/esp32c3_system.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/src/esp32c3/hardware/esp32c3_system.h
+ * arch/risc-v/src/esp32c3-legacy/hardware/esp32c3_system.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_SRC_ESP32C3_HARDWARE_ESP32C3_SYSTEM_H
-#define __ARCH_RISCV_SRC_ESP32C3_HARDWARE_ESP32C3_SYSTEM_H
+#ifndef __ARCH_RISCV_SRC_ESP32C3_LEGACY_HARDWARE_ESP32C3_SYSTEM_H
+#define __ARCH_RISCV_SRC_ESP32C3_LEGACY_HARDWARE_ESP32C3_SYSTEM_H
 
 /****************************************************************************
  * Included Files
@@ -1216,4 +1216,4 @@
 #define SYSTEM_DATE_V  0xfffffff
 #define SYSTEM_DATE_S  0
 
-#endif /* __ARCH_RISCV_SRC_ESP32C3_HARDWARE_ESP32C3_SYSTEM_H */
+#endif /* __ARCH_RISCV_SRC_ESP32C3_LEGACY_HARDWARE_ESP32C3_SYSTEM_H */
diff --git a/arch/risc-v/src/esp32c3/hardware/esp32c3_systimer.h b/arch/risc-v/src/esp32c3-legacy/hardware/esp32c3_systimer.h
similarity index 98%
rename from arch/risc-v/src/esp32c3/hardware/esp32c3_systimer.h
rename to arch/risc-v/src/esp32c3-legacy/hardware/esp32c3_systimer.h
index ef317cb0201..a21aee905b6 100644
--- a/arch/risc-v/src/esp32c3/hardware/esp32c3_systimer.h
+++ b/arch/risc-v/src/esp32c3-legacy/hardware/esp32c3_systimer.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/src/esp32c3/hardware/esp32c3_systimer.h
+ * arch/risc-v/src/esp32c3-legacy/hardware/esp32c3_systimer.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_SRC_ESP32C3_HARDWARE_ESP32C3_SYSTIMER_H
-#define __ARCH_RISCV_SRC_ESP32C3_HARDWARE_ESP32C3_SYSTIMER_H
+#ifndef __ARCH_RISCV_SRC_ESP32C3_LEGACY_HARDWARE_ESP32C3_SYSTIMER_H
+#define __ARCH_RISCV_SRC_ESP32C3_LEGACY_HARDWARE_ESP32C3_SYSTIMER_H
 
 /****************************************************************************
  * Included Files
@@ -584,4 +584,4 @@
 #define SYS_TIMER_DATE_V  0xffffffff
 #define SYS_TIMER_DATE_S  0
 
-#endif /* __ARCH_RISCV_SRC_ESP32C3_HARDWARE_ESP32C3_SYSTIMER_H */
+#endif /* __ARCH_RISCV_SRC_ESP32C3_LEGACY_HARDWARE_ESP32C3_SYSTIMER_H */
diff --git a/arch/risc-v/src/esp32c3/hardware/esp32c3_tim.h b/arch/risc-v/src/esp32c3-legacy/hardware/esp32c3_tim.h
similarity index 98%
rename from arch/risc-v/src/esp32c3/hardware/esp32c3_tim.h
rename to arch/risc-v/src/esp32c3-legacy/hardware/esp32c3_tim.h
index 0049bb91378..f8a812b7db2 100644
--- a/arch/risc-v/src/esp32c3/hardware/esp32c3_tim.h
+++ b/arch/risc-v/src/esp32c3-legacy/hardware/esp32c3_tim.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/src/esp32c3/hardware/esp32c3_tim.h
+ * arch/risc-v/src/esp32c3-legacy/hardware/esp32c3_tim.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_SRC_ESP32C3_HARDWARE_ESP32C3_TIM_H
-#define __ARCH_RISCV_SRC_ESP32C3_HARDWARE_ESP32C3_TIM_H
+#ifndef __ARCH_RISCV_SRC_ESP32C3_LEGACY_HARDWARE_ESP32C3_TIM_H
+#define __ARCH_RISCV_SRC_ESP32C3_LEGACY_HARDWARE_ESP32C3_TIM_H
 
 /****************************************************************************
  * Included Files
@@ -534,4 +534,4 @@
 #define TIMG_WDT_CLK_IS_ACTIVE_V  0x1
 #define TIMG_WDT_CLK_IS_ACTIVE_S  29
 
-#endif /* __ARCH_RISCV_SRC_ESP32C3_HARDWARE_ESP32C3_TIM_H */
+#endif /* __ARCH_RISCV_SRC_ESP32C3_LEGACY_HARDWARE_ESP32C3_TIM_H */
diff --git a/arch/risc-v/src/esp32c3/hardware/esp32c3_twai.h b/arch/risc-v/src/esp32c3-legacy/hardware/esp32c3_twai.h
similarity index 99%
rename from arch/risc-v/src/esp32c3/hardware/esp32c3_twai.h
rename to arch/risc-v/src/esp32c3-legacy/hardware/esp32c3_twai.h
index 2aa56b84dd2..94161252d42 100644
--- a/arch/risc-v/src/esp32c3/hardware/esp32c3_twai.h
+++ b/arch/risc-v/src/esp32c3-legacy/hardware/esp32c3_twai.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/src/esp32c3/hardware/esp32c3_twai.h
+ * arch/risc-v/src/esp32c3-legacy/hardware/esp32c3_twai.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_SRC_ESP32C3_HARDWARE_ESP32C3_TWAI_H
-#define __ARCH_RISCV_SRC_ESP32C3_HARDWARE_ESP32C3_TWAI_H
+#ifndef __ARCH_RISCV_SRC_ESP32C3_LEGACY_HARDWARE_ESP32C3_TWAI_H
+#define __ARCH_RISCV_SRC_ESP32C3_LEGACY_HARDWARE_ESP32C3_TWAI_H
 
 /****************************************************************************
  * Included Files
@@ -853,4 +853,4 @@
 #define TWAI_CD_V  0x000000FF
 #define TWAI_CD_S  0
 
-#endif /* __ARCH_RISCV_SRC_ESP32C3_HARDWARE_ESP32C3_TWAI_H */
+#endif /* __ARCH_RISCV_SRC_ESP32C3_LEGACY_HARDWARE_ESP32C3_TWAI_H */
diff --git a/arch/risc-v/src/esp32c3/hardware/esp32c3_uart.h b/arch/risc-v/src/esp32c3-legacy/hardware/esp32c3_uart.h
similarity index 99%
rename from arch/risc-v/src/esp32c3/hardware/esp32c3_uart.h
rename to arch/risc-v/src/esp32c3-legacy/hardware/esp32c3_uart.h
index 511104ff112..7aff24a0698 100644
--- a/arch/risc-v/src/esp32c3/hardware/esp32c3_uart.h
+++ b/arch/risc-v/src/esp32c3-legacy/hardware/esp32c3_uart.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/src/esp32c3/hardware/esp32c3_uart.h
+ * arch/risc-v/src/esp32c3-legacy/hardware/esp32c3_uart.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_SRC_ESP32C3_HARDWARE_ESP32C3_UART_H
-#define __ARCH_RISCV_SRC_ESP32C3_HARDWARE_ESP32C3_UART_H
+#ifndef __ARCH_RISCV_SRC_ESP32C3_LEGACY_HARDWARE_ESP32C3_UART_H
+#define __ARCH_RISCV_SRC_ESP32C3_LEGACY_HARDWARE_ESP32C3_UART_H
 
 /****************************************************************************
  * Included Files
@@ -2203,4 +2203,4 @@
 #define UART_UPDATE_V  0x1
 #define UART_UPDATE_S  31
 
-#endif /* __ARCH_RISCV_SRC_ESP32C3_HARDWARE_ESP32C3_UART_H */
\ No newline at end of file
+#endif /* __ARCH_RISCV_SRC_ESP32C3_LEGACY_HARDWARE_ESP32C3_UART_H */
\ No newline at end of file
diff --git a/arch/risc-v/src/esp32c3/hardware/esp32c3_usb_serial_jtag.h b/arch/risc-v/src/esp32c3-legacy/hardware/esp32c3_usb_serial_jtag.h
similarity index 99%
rename from arch/risc-v/src/esp32c3/hardware/esp32c3_usb_serial_jtag.h
rename to arch/risc-v/src/esp32c3-legacy/hardware/esp32c3_usb_serial_jtag.h
index 3295e07fbf1..b51a892e52b 100644
--- a/arch/risc-v/src/esp32c3/hardware/esp32c3_usb_serial_jtag.h
+++ b/arch/risc-v/src/esp32c3-legacy/hardware/esp32c3_usb_serial_jtag.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/src/esp32c3/hardware/esp32c3_usb_serial_jtag.h
+ * arch/risc-v/src/esp32c3-legacy/hardware/esp32c3_usb_serial_jtag.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_SRC_ESP32C3_HARDWARE_ESP32C3_USB_SERIAL_JTAG_H
-#define __ARCH_RISCV_SRC_ESP32C3_HARDWARE_ESP32C3_USB_SERIAL_JTAG_H
+#ifndef __ARCH_RISCV_SRC_ESP32C3_LEGACY_HARDWARE_ESP32C3_USB_SERIAL_JTAG_H
+#define __ARCH_RISCV_SRC_ESP32C3_LEGACY_HARDWARE_ESP32C3_USB_SERIAL_JTAG_H
 
 /****************************************************************************
  * Included Files
@@ -1230,4 +1230,4 @@
 #define USB_SERIAL_JTAG_DATE_V  0xffffffff
 #define USB_SERIAL_JTAG_DATE_S  0
 
-#endif /* __ARCH_RISCV_SRC_ESP32C3_HARDWARE_ESP32C3_USB_SERIAL_JTAG_H */
+#endif /* __ARCH_RISCV_SRC_ESP32C3_LEGACY_HARDWARE_ESP32C3_USB_SERIAL_JTAG_H */
diff --git a/arch/risc-v/src/esp32c3/hardware/extmem_reg.h b/arch/risc-v/src/esp32c3-legacy/hardware/extmem_reg.h
similarity index 93%
rename from arch/risc-v/src/esp32c3/hardware/extmem_reg.h
rename to arch/risc-v/src/esp32c3-legacy/hardware/extmem_reg.h
index 07d112ab6d8..dfd110ed677 100644
--- a/arch/risc-v/src/esp32c3/hardware/extmem_reg.h
+++ b/arch/risc-v/src/esp32c3-legacy/hardware/extmem_reg.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/src/esp32c3/hardware/extmem_reg.h
+ * arch/risc-v/src/esp32c3-legacy/hardware/extmem_reg.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_SRC_ESP32C3_HARDWARE_EXTMEM_REG_H
-#define __ARCH_RISCV_SRC_ESP32C3_HARDWARE_EXTMEM_REG_H
+#ifndef __ARCH_RISCV_SRC_ESP32C3_LEGACY_HARDWARE_EXTMEM_REG_H
+#define __ARCH_RISCV_SRC_ESP32C3_LEGACY_HARDWARE_EXTMEM_REG_H
 
 /****************************************************************************
  * Included Files
@@ -87,4 +87,4 @@
 #define EXTMEM_ICACHE_TAG_MEM_FORCE_ON_V  0x1
 #define EXTMEM_ICACHE_TAG_MEM_FORCE_ON_S  0
 
-#endif /* __ARCH_RISCV_SRC_ESP32C3_HARDWARE_EXTMEM_REG_H */
+#endif /* __ARCH_RISCV_SRC_ESP32C3_LEGACY_HARDWARE_EXTMEM_REG_H */
diff --git a/arch/risc-v/src/esp32c3/hardware/fe_reg.h b/arch/risc-v/src/esp32c3-legacy/hardware/fe_reg.h
similarity index 88%
rename from arch/risc-v/src/esp32c3/hardware/fe_reg.h
rename to arch/risc-v/src/esp32c3-legacy/hardware/fe_reg.h
index f65c3008e1f..629d418615b 100644
--- a/arch/risc-v/src/esp32c3/hardware/fe_reg.h
+++ b/arch/risc-v/src/esp32c3-legacy/hardware/fe_reg.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/src/esp32c3/hardware/fe_reg.h
+ * arch/risc-v/src/esp32c3-legacy/hardware/fe_reg.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_SRC_ESP32C3_HARDWARE_FE_REG_H
-#define __ARCH_RISCV_SRC_ESP32C3_HARDWARE_FE_REG_H
+#ifndef __ARCH_RISCV_SRC_ESP32C3_LEGACY_HARDWARE_FE_REG_H
+#define __ARCH_RISCV_SRC_ESP32C3_LEGACY_HARDWARE_FE_REG_H
 
 /****************************************************************************
  * Included Files
@@ -47,4 +47,4 @@
 #define FE2_TX_INF_FORCE_PU_V 1
 #define FE2_TX_INF_FORCE_PU_S 10
 
-#endif /* __ARCH_RISCV_SRC_ESP32C3_HARDWARE_FE_REG_H */
+#endif /* __ARCH_RISCV_SRC_ESP32C3_LEGACY_HARDWARE_FE_REG_H */
diff --git a/arch/risc-v/src/esp32c3/hardware/nrx_reg.h b/arch/risc-v/src/esp32c3-legacy/hardware/nrx_reg.h
similarity index 89%
rename from arch/risc-v/src/esp32c3/hardware/nrx_reg.h
rename to arch/risc-v/src/esp32c3-legacy/hardware/nrx_reg.h
index e0fa0911326..fd8998e5622 100644
--- a/arch/risc-v/src/esp32c3/hardware/nrx_reg.h
+++ b/arch/risc-v/src/esp32c3-legacy/hardware/nrx_reg.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/src/esp32c3/hardware/nrx_reg.h
+ * arch/risc-v/src/esp32c3-legacy/hardware/nrx_reg.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_SRC_ESP32C3_HARDWARE_NRX_REG_H
-#define __ARCH_RISCV_SRC_ESP32C3_HARDWARE_NRX_REG_H
+#ifndef __ARCH_RISCV_SRC_ESP32C3_LEGACY_HARDWARE_NRX_REG_H
+#define __ARCH_RISCV_SRC_ESP32C3_LEGACY_HARDWARE_NRX_REG_H
 
 /****************************************************************************
  * Included Files
@@ -49,4 +49,4 @@
 #define NRX_DEMAP_FORCE_PU_V  1
 #define NRX_DEMAP_FORCE_PU_S  1
 
-#endif /* __ARCH_RISCV_SRC_ESP32C3_HARDWARE_NRX_REG_H */
+#endif /* __ARCH_RISCV_SRC_ESP32C3_LEGACY_HARDWARE_NRX_REG_H */
diff --git a/arch/risc-v/src/esp32c3/hardware/regi2c_bbpll.h b/arch/risc-v/src/esp32c3-legacy/hardware/regi2c_bbpll.h
similarity index 90%
rename from arch/risc-v/src/esp32c3/hardware/regi2c_bbpll.h
rename to arch/risc-v/src/esp32c3-legacy/hardware/regi2c_bbpll.h
index cd36f2692e3..fdee8afa8ac 100644
--- a/arch/risc-v/src/esp32c3/hardware/regi2c_bbpll.h
+++ b/arch/risc-v/src/esp32c3-legacy/hardware/regi2c_bbpll.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/src/esp32c3/hardware/regi2c_bbpll.h
+ * arch/risc-v/src/esp32c3-legacy/hardware/regi2c_bbpll.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_SRC_ESP32C3_HARDWARE_REGI2C_BBPLL_H
-#define __ARCH_RISCV_SRC_ESP32C3_HARDWARE_REGI2C_BBPLL_H
+#ifndef __ARCH_RISCV_SRC_ESP32C3_LEGACY_HARDWARE_REGI2C_BBPLL_H
+#define __ARCH_RISCV_SRC_ESP32C3_LEGACY_HARDWARE_REGI2C_BBPLL_H
 
 /****************************************************************************
  * Pre-processor Definitions
@@ -72,4 +72,4 @@
 #define I2C_BBPLL_OC_DIV_7_0_MSB    7
 #define I2C_BBPLL_OC_DIV_7_0_LSB    0
 
-#endif /* __ARCH_RISCV_SRC_ESP32C3_HARDWARE_REGI2C_BBPLL_H */
+#endif /* __ARCH_RISCV_SRC_ESP32C3_LEGACY_HARDWARE_REGI2C_BBPLL_H */
diff --git a/arch/risc-v/src/esp32c3/hardware/regi2c_brownout.h b/arch/risc-v/src/esp32c3-legacy/hardware/regi2c_brownout.h
similarity index 81%
rename from arch/risc-v/src/esp32c3/hardware/regi2c_brownout.h
rename to arch/risc-v/src/esp32c3-legacy/hardware/regi2c_brownout.h
index c5a832d5d5b..bf186d61020 100644
--- a/arch/risc-v/src/esp32c3/hardware/regi2c_brownout.h
+++ b/arch/risc-v/src/esp32c3-legacy/hardware/regi2c_brownout.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/src/esp32c3/hardware/regi2c_brownout.h
+ * arch/risc-v/src/esp32c3-legacy/hardware/regi2c_brownout.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_SRC_ESP32C3_HARDWARE_REGI2C_BROWNOUT_H
-#define __ARCH_RISCV_SRC_ESP32C3_HARDWARE_REGI2C_BROWNOUT_H
+#ifndef __ARCH_RISCV_SRC_ESP32C3_LEGACY_HARDWARE_REGI2C_BROWNOUT_H
+#define __ARCH_RISCV_SRC_ESP32C3_LEGACY_HARDWARE_REGI2C_BROWNOUT_H
 
 #define I2C_BOD                     0x61
 #define I2C_BOD_HOSTID              0
@@ -28,4 +28,4 @@
 #define I2C_BOD_THRESHOLD_MSB       2
 #define I2C_BOD_THRESHOLD_LSB       0
 
-#endif /* __ARCH_RISCV_SRC_ESP32C3_HARDWARE_REGI2C_BROWNOUT_H */
+#endif /* __ARCH_RISCV_SRC_ESP32C3_LEGACY_HARDWARE_REGI2C_BROWNOUT_H */
diff --git a/arch/risc-v/src/esp32c3/hardware/regi2c_ctrl.h b/arch/risc-v/src/esp32c3-legacy/hardware/regi2c_ctrl.h
similarity index 91%
rename from arch/risc-v/src/esp32c3/hardware/regi2c_ctrl.h
rename to arch/risc-v/src/esp32c3-legacy/hardware/regi2c_ctrl.h
index 785ac470b29..ca2cf03a768 100644
--- a/arch/risc-v/src/esp32c3/hardware/regi2c_ctrl.h
+++ b/arch/risc-v/src/esp32c3-legacy/hardware/regi2c_ctrl.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/src/esp32c3/hardware/regi2c_ctrl.h
+ * arch/risc-v/src/esp32c3-legacy/hardware/regi2c_ctrl.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_SRC_ESP32C3_HARDWARE_REGI2C_CTRL_H
-#define __ARCH_RISCV_SRC_ESP32C3_HARDWARE_REGI2C_CTRL_H
+#ifndef __ARCH_RISCV_SRC_ESP32C3_LEGACY_HARDWARE_REGI2C_CTRL_H
+#define __ARCH_RISCV_SRC_ESP32C3_LEGACY_HARDWARE_REGI2C_CTRL_H
 
 /****************************************************************************
  * Included Files
@@ -66,4 +66,4 @@ extern void rom_i2c_writereg_mask(uint8_t block, uint8_t host_id,
 #define REGI2C_READ(block, reg_add) \
       rom_i2c_readreg(block, block##_HOSTID,  reg_add)
 
-#endif /* __ARCH_RISCV_SRC_ESP32C3_HARDWARE_REGI2C_CTRL_H */
+#endif /* __ARCH_RISCV_SRC_ESP32C3_LEGACY_HARDWARE_REGI2C_CTRL_H */
diff --git a/arch/risc-v/src/esp32c3/hardware/regi2c_dig_reg.h b/arch/risc-v/src/esp32c3-legacy/hardware/regi2c_dig_reg.h
similarity index 88%
rename from arch/risc-v/src/esp32c3/hardware/regi2c_dig_reg.h
rename to arch/risc-v/src/esp32c3-legacy/hardware/regi2c_dig_reg.h
index 1ced0993e64..d4ed9b6dc59 100644
--- a/arch/risc-v/src/esp32c3/hardware/regi2c_dig_reg.h
+++ b/arch/risc-v/src/esp32c3-legacy/hardware/regi2c_dig_reg.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/src/esp32c3/hardware/regi2c_dig_reg.h
+ * arch/risc-v/src/esp32c3-legacy/hardware/regi2c_dig_reg.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_SRC_ESP32C3_HARDWARE_REGI2C_DIG_REG_H
-#define __ARCH_RISCV_SRC_ESP32C3_HARDWARE_REGI2C_DIG_REG_H
+#ifndef __ARCH_RISCV_SRC_ESP32C3_LEGACY_HARDWARE_REGI2C_DIG_REG_H
+#define __ARCH_RISCV_SRC_ESP32C3_LEGACY_HARDWARE_REGI2C_DIG_REG_H
 
 /****************************************************************************
  * Pre-processor Definitions
@@ -56,4 +56,4 @@
 #define I2C_DIG_REG_XPD_DIG_REG_MSB 3
 #define I2C_DIG_REG_XPD_DIG_REG_LSB 3
 
-#endif /* __ARCH_RISCV_SRC_ESP32C3_HARDWARE_REGI2C_DIG_REG_H */
+#endif /* __ARCH_RISCV_SRC_ESP32C3_LEGACY_HARDWARE_REGI2C_DIG_REG_H */
diff --git a/arch/risc-v/src/esp32c3/hardware/regi2c_lp_bias.h b/arch/risc-v/src/esp32c3-legacy/hardware/regi2c_lp_bias.h
similarity index 88%
rename from arch/risc-v/src/esp32c3/hardware/regi2c_lp_bias.h
rename to arch/risc-v/src/esp32c3-legacy/hardware/regi2c_lp_bias.h
index b0f16d124f6..b887e8b9e7f 100644
--- a/arch/risc-v/src/esp32c3/hardware/regi2c_lp_bias.h
+++ b/arch/risc-v/src/esp32c3-legacy/hardware/regi2c_lp_bias.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/src/esp32c3/hardware/regi2c_lp_bias.h
+ * arch/risc-v/src/esp32c3-legacy/hardware/regi2c_lp_bias.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_SRC_ESP32C3_HARDWARE_REGI2C_LP_BIAS_H
-#define __ARCH_RISCV_SRC_ESP32C3_HARDWARE_REGI2C_LP_BIAS_H
+#ifndef __ARCH_RISCV_SRC_ESP32C3_LEGACY_HARDWARE_REGI2C_LP_BIAS_H
+#define __ARCH_RISCV_SRC_ESP32C3_LEGACY_HARDWARE_REGI2C_LP_BIAS_H
 
 /****************************************************************************
  * Pre-processor Definitions
@@ -57,4 +57,4 @@
 #define I2C_ULP_EXT_CODE_MSB 7
 #define I2C_ULP_EXT_CODE_LSB 0
 
-#endif /* __ARCH_RISCV_SRC_ESP32C3_HARDWARE_REGI2C_LP_BIAS_H */
+#endif /* __ARCH_RISCV_SRC_ESP32C3_LEGACY_HARDWARE_REGI2C_LP_BIAS_H */
diff --git a/arch/risc-v/src/esp32c3/hardware/regi2c_saradc.h b/arch/risc-v/src/esp32c3-legacy/hardware/regi2c_saradc.h
similarity index 87%
rename from arch/risc-v/src/esp32c3/hardware/regi2c_saradc.h
rename to arch/risc-v/src/esp32c3-legacy/hardware/regi2c_saradc.h
index f4fe0881ab8..74518d97d59 100644
--- a/arch/risc-v/src/esp32c3/hardware/regi2c_saradc.h
+++ b/arch/risc-v/src/esp32c3-legacy/hardware/regi2c_saradc.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/src/esp32c3/hardware/regi2c_saradc.h
+ * arch/risc-v/src/esp32c3-legacy/hardware/regi2c_saradc.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_SRC_ESP32C3_HARDWARE_REGI2C_SARADC_H
-#define __ARCH_RISCV_SRC_ESP32C3_HARDWARE_REGI2C_SARADC_H
+#ifndef __ARCH_RISCV_SRC_ESP32C3_LEGACY_HARDWARE_REGI2C_SARADC_H
+#define __ARCH_RISCV_SRC_ESP32C3_LEGACY_HARDWARE_REGI2C_SARADC_H
 
 /****************************************************************************
  * Pre-processor Definitions
@@ -48,4 +48,4 @@
 #define I2C_ADC1_DEF_MSB        (0x6)
 #define I2C_ADC1_DEF_LSB        (0x4)
 
-#endif /* __ARCH_RISCV_SRC_ESP32C3_HARDWARE_REGI2C_SARADC_H */
+#endif /* __ARCH_RISCV_SRC_ESP32C3_LEGACY_HARDWARE_REGI2C_SARADC_H */
diff --git a/arch/risc-v/src/esp32c3/hardware/spi_mem_reg.h b/arch/risc-v/src/esp32c3-legacy/hardware/spi_mem_reg.h
similarity index 87%
rename from arch/risc-v/src/esp32c3/hardware/spi_mem_reg.h
rename to arch/risc-v/src/esp32c3-legacy/hardware/spi_mem_reg.h
index fe402b40206..eff6f450435 100644
--- a/arch/risc-v/src/esp32c3/hardware/spi_mem_reg.h
+++ b/arch/risc-v/src/esp32c3-legacy/hardware/spi_mem_reg.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/src/esp32c3/hardware/spi_mem_reg.h
+ * arch/risc-v/src/esp32c3-legacy/hardware/spi_mem_reg.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_SRC_ESP32C3_HARDWARE_SPI_MEM_REG_H
-#define __ARCH_RISCV_SRC_ESP32C3_HARDWARE_SPI_MEM_REG_H
+#ifndef __ARCH_RISCV_SRC_ESP32C3_LEGACY_HARDWARE_SPI_MEM_REG_H
+#define __ARCH_RISCV_SRC_ESP32C3_LEGACY_HARDWARE_SPI_MEM_REG_H
 
 /****************************************************************************
  * Included Files
@@ -43,4 +43,4 @@
 #define SPI_MEM_CLK_EN_V  0x1
 #define SPI_MEM_CLK_EN_S  0
 
-#endif /* __ARCH_RISCV_SRC_ESP32C3_HARDWARE_SPI_MEM_REG_H */
+#endif /* __ARCH_RISCV_SRC_ESP32C3_LEGACY_HARDWARE_SPI_MEM_REG_H */
diff --git a/arch/risc-v/src/esp32c3/hardware/wdev_reg.h b/arch/risc-v/src/esp32c3-legacy/hardware/wdev_reg.h
similarity index 83%
rename from arch/risc-v/src/esp32c3/hardware/wdev_reg.h
rename to arch/risc-v/src/esp32c3-legacy/hardware/wdev_reg.h
index a25d3ac2bbe..3d50359cbc9 100644
--- a/arch/risc-v/src/esp32c3/hardware/wdev_reg.h
+++ b/arch/risc-v/src/esp32c3-legacy/hardware/wdev_reg.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/src/esp32c3/hardware/wdev_reg.h
+ * arch/risc-v/src/esp32c3-legacy/hardware/wdev_reg.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_SRC_ESP32C3_HARDWARE_WDEV_REG_H
-#define __ARCH_RISCV_SRC_ESP32C3_HARDWARE_WDEV_REG_H
+#ifndef __ARCH_RISCV_SRC_ESP32C3_LEGACY_HARDWARE_WDEV_REG_H
+#define __ARCH_RISCV_SRC_ESP32C3_LEGACY_HARDWARE_WDEV_REG_H
 
 /****************************************************************************
  * Included Files
@@ -31,4 +31,4 @@
 
 #define WDEV_RND_REG 0x600260b0
 
-#endif /* __ARCH_RISCV_SRC_ESP32C3_HARDWARE_WDEV_REG_H */
+#endif /* __ARCH_RISCV_SRC_ESP32C3_LEGACY_HARDWARE_WDEV_REG_H */
diff --git a/arch/risc-v/src/esp32c3/rom/esp32c3_libc_stubs.h b/arch/risc-v/src/esp32c3-legacy/rom/esp32c3_libc_stubs.h
similarity index 94%
rename from arch/risc-v/src/esp32c3/rom/esp32c3_libc_stubs.h
rename to arch/risc-v/src/esp32c3-legacy/rom/esp32c3_libc_stubs.h
index d540acab44f..47e9f844173 100644
--- a/arch/risc-v/src/esp32c3/rom/esp32c3_libc_stubs.h
+++ b/arch/risc-v/src/esp32c3-legacy/rom/esp32c3_libc_stubs.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/src/esp32c3/rom/esp32c3_libc_stubs.h
+ * arch/risc-v/src/esp32c3-legacy/rom/esp32c3_libc_stubs.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_SRC_ESP32C3_ROM_ESP32C3_LIBC_STUBS_H
-#define __ARCH_RISCV_SRC_ESP32C3_ROM_ESP32C3_LIBC_STUBS_H
+#ifndef __ARCH_RISCV_SRC_ESP32C3_LEGACY_ROM_ESP32C3_LIBC_STUBS_H
+#define __ARCH_RISCV_SRC_ESP32C3_LEGACY_ROM_ESP32C3_LIBC_STUBS_H
 
 /****************************************************************************
  * Included Files
@@ -110,4 +110,4 @@ extern const struct syscall_stub_table *syscall_table_ptr;
 
 void setup_syscall_table(void);
 
-#endif /* __ARCH_RISCV_SRC_ESP32C3_ROM_ESP32C3_LIBC_STUBS_H */
+#endif /* __ARCH_RISCV_SRC_ESP32C3_LEGACY_ROM_ESP32C3_LIBC_STUBS_H */
diff --git a/arch/risc-v/src/esp32c3/rom/esp32c3_spiflash.h b/arch/risc-v/src/esp32c3-legacy/rom/esp32c3_spiflash.h
similarity index 99%
rename from arch/risc-v/src/esp32c3/rom/esp32c3_spiflash.h
rename to arch/risc-v/src/esp32c3-legacy/rom/esp32c3_spiflash.h
index 1c1c4fb9cbc..0e015be6fe0 100644
--- a/arch/risc-v/src/esp32c3/rom/esp32c3_spiflash.h
+++ b/arch/risc-v/src/esp32c3-legacy/rom/esp32c3_spiflash.h
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * arch/risc-v/src/esp32c3/rom/esp32c3_spiflash.h
+ * arch/risc-v/src/esp32c3-legacy/rom/esp32c3_spiflash.h
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/boards/Kconfig b/boards/Kconfig
index 2ee33972986..0e2a808a776 100644
--- a/boards/Kconfig
+++ b/boards/Kconfig
@@ -4186,10 +4186,10 @@ if ARCH_BOARD_BL808_OX64
 source "boards/risc-v/bl808/ox64/Kconfig"
 endif
 if ARCH_BOARD_ESP32C3_DEVKIT
-source "boards/risc-v/esp32c3/esp32c3-devkit/Kconfig"
+source "boards/risc-v/esp32c3-legacy/esp32c3-devkit/Kconfig"
 endif
 if ARCH_BOARD_ESP32C3_DEVKIT_RUST1
-source "boards/risc-v/esp32c3/esp32c3-devkit-rust-1/Kconfig"
+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"
@@ -4352,7 +4352,7 @@ if ARCH_CHIP_ESP32S3
 source "boards/xtensa/esp32s3/common/Kconfig"
 endif
 if ARCH_CHIP_ESP32C3
-source "boards/risc-v/esp32c3/common/Kconfig"
+source "boards/risc-v/esp32c3-legacy/common/Kconfig"
 endif
 if ARCH_CHIP_ESPRESSIF
 source "boards/risc-v/espressif/common/Kconfig"
diff --git a/boards/risc-v/esp32c3/common/.gitignore b/boards/risc-v/esp32c3-legacy/common/.gitignore
similarity index 100%
rename from boards/risc-v/esp32c3/common/.gitignore
rename to boards/risc-v/esp32c3-legacy/common/.gitignore
diff --git a/boards/risc-v/esp32c3/common/Kconfig b/boards/risc-v/esp32c3-legacy/common/Kconfig
similarity index 100%
rename from boards/risc-v/esp32c3/common/Kconfig
rename to boards/risc-v/esp32c3-legacy/common/Kconfig
diff --git a/boards/risc-v/esp32c3/common/Makefile b/boards/risc-v/esp32c3-legacy/common/Makefile
similarity index 96%
rename from boards/risc-v/esp32c3/common/Makefile
rename to boards/risc-v/esp32c3-legacy/common/Makefile
index 8ea9c30d28d..26c4aef36e5 100644
--- a/boards/risc-v/esp32c3/common/Makefile
+++ b/boards/risc-v/esp32c3-legacy/common/Makefile
@@ -1,5 +1,5 @@
 #############################################################################
-# boards/risc-v/esp32c3/common/Makefile
+# boards/risc-v/esp32c3-legacy/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/esp32c3/common/include/esp32c3_board_adc.h b/boards/risc-v/esp32c3-legacy/common/include/esp32c3_board_adc.h
similarity index 97%
rename from boards/risc-v/esp32c3/common/include/esp32c3_board_adc.h
rename to boards/risc-v/esp32c3-legacy/common/include/esp32c3_board_adc.h
index 5faff36ff41..ad20948aa4f 100644
--- a/boards/risc-v/esp32c3/common/include/esp32c3_board_adc.h
+++ b/boards/risc-v/esp32c3-legacy/common/include/esp32c3_board_adc.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * boards/risc-v/esp32c3/common/include/esp32c3_board_adc.h
+ * boards/risc-v/esp32c3-legacy/common/include/esp32c3_board_adc.h
  *
  * 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/esp32c3/common/include/esp32c3_board_apds9960.h b/boards/risc-v/esp32c3-legacy/common/include/esp32c3_board_apds9960.h
similarity index 97%
rename from boards/risc-v/esp32c3/common/include/esp32c3_board_apds9960.h
rename to boards/risc-v/esp32c3-legacy/common/include/esp32c3_board_apds9960.h
index 8aa05e802b4..b7448e3c45d 100644
--- a/boards/risc-v/esp32c3/common/include/esp32c3_board_apds9960.h
+++ b/boards/risc-v/esp32c3-legacy/common/include/esp32c3_board_apds9960.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * boards/risc-v/esp32c3/common/include/esp32c3_board_apds9960.h
+ * boards/risc-v/esp32c3-legacy/common/include/esp32c3_board_apds9960.h
  *
  * 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/esp32c3/common/include/esp32c3_board_bmp180.h b/boards/risc-v/esp32c3-legacy/common/include/esp32c3_board_bmp180.h
similarity index 97%
rename from boards/risc-v/esp32c3/common/include/esp32c3_board_bmp180.h
rename to boards/risc-v/esp32c3-legacy/common/include/esp32c3_board_bmp180.h
index 211e1919dcb..8492465fa54 100644
--- a/boards/risc-v/esp32c3/common/include/esp32c3_board_bmp180.h
+++ b/boards/risc-v/esp32c3-legacy/common/include/esp32c3_board_bmp180.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * boards/risc-v/esp32c3/common/include/esp32c3_board_bmp180.h
+ * boards/risc-v/esp32c3-legacy/common/include/esp32c3_board_bmp180.h
  *
  * 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/esp32c3/common/include/esp32c3_board_i2c.h b/boards/risc-v/esp32c3-legacy/common/include/esp32c3_board_i2c.h
similarity index 97%
rename from boards/risc-v/esp32c3/common/include/esp32c3_board_i2c.h
rename to boards/risc-v/esp32c3-legacy/common/include/esp32c3_board_i2c.h
index 0404336f4ef..5b705ba3830 100644
--- a/boards/risc-v/esp32c3/common/include/esp32c3_board_i2c.h
+++ b/boards/risc-v/esp32c3-legacy/common/include/esp32c3_board_i2c.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * boards/risc-v/esp32c3/common/include/esp32c3_board_i2c.h
+ * boards/risc-v/esp32c3-legacy/common/include/esp32c3_board_i2c.h
  *
  * 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/esp32c3/common/include/esp32c3_board_ledc.h b/boards/risc-v/esp32c3-legacy/common/include/esp32c3_board_ledc.h
similarity index 97%
rename from boards/risc-v/esp32c3/common/include/esp32c3_board_ledc.h
rename to boards/risc-v/esp32c3-legacy/common/include/esp32c3_board_ledc.h
index adfb93f052b..8bcc0b4cc29 100644
--- a/boards/risc-v/esp32c3/common/include/esp32c3_board_ledc.h
+++ b/boards/risc-v/esp32c3-legacy/common/include/esp32c3_board_ledc.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * boards/risc-v/esp32c3/common/include/esp32c3_board_ledc.h
+ * boards/risc-v/esp32c3-legacy/common/include/esp32c3_board_ledc.h
  *
  * 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/esp32c3/common/include/esp32c3_board_mpu60x0_i2c.h b/boards/risc-v/esp32c3-legacy/common/include/esp32c3_board_mpu60x0_i2c.h
similarity index 97%
rename from boards/risc-v/esp32c3/common/include/esp32c3_board_mpu60x0_i2c.h
rename to boards/risc-v/esp32c3-legacy/common/include/esp32c3_board_mpu60x0_i2c.h
index ff7059bf4a7..b4a812a947d 100644
--- a/boards/risc-v/esp32c3/common/include/esp32c3_board_mpu60x0_i2c.h
+++ b/boards/risc-v/esp32c3-legacy/common/include/esp32c3_board_mpu60x0_i2c.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * boards/risc-v/esp32c3/common/include/esp32c3_board_mpu60x0_i2c.h
+ * boards/risc-v/esp32c3-legacy/common/include/esp32c3_board_mpu60x0_i2c.h
  *
  * 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/esp32c3/common/include/esp32c3_board_oneshot.h b/boards/risc-v/esp32c3-legacy/common/include/esp32c3_board_oneshot.h
similarity index 97%
rename from boards/risc-v/esp32c3/common/include/esp32c3_board_oneshot.h
rename to boards/risc-v/esp32c3-legacy/common/include/esp32c3_board_oneshot.h
index 8722b9e978b..1260f71096f 100644
--- a/boards/risc-v/esp32c3/common/include/esp32c3_board_oneshot.h
+++ b/boards/risc-v/esp32c3-legacy/common/include/esp32c3_board_oneshot.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * boards/risc-v/esp32c3/common/include/esp32c3_board_oneshot.h
+ * boards/risc-v/esp32c3-legacy/common/include/esp32c3_board_oneshot.h
  *
  * 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/esp32c3/common/include/esp32c3_board_spidev.h b/boards/risc-v/esp32c3-legacy/common/include/esp32c3_board_spidev.h
similarity index 97%
rename from boards/risc-v/esp32c3/common/include/esp32c3_board_spidev.h
rename to boards/risc-v/esp32c3-legacy/common/include/esp32c3_board_spidev.h
index d015b224c05..0b9318d3cd0 100644
--- a/boards/risc-v/esp32c3/common/include/esp32c3_board_spidev.h
+++ b/boards/risc-v/esp32c3-legacy/common/include/esp32c3_board_spidev.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * boards/risc-v/esp32c3/common/include/esp32c3_board_spidev.h
+ * boards/risc-v/esp32c3-legacy/common/include/esp32c3_board_spidev.h
  *
  * 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/esp32c3/common/include/esp32c3_board_spiflash.h b/boards/risc-v/esp32c3-legacy/common/include/esp32c3_board_spiflash.h
similarity index 97%
rename from boards/risc-v/esp32c3/common/include/esp32c3_board_spiflash.h
rename to boards/risc-v/esp32c3-legacy/common/include/esp32c3_board_spiflash.h
index 4229983b708..d95fe68772e 100644
--- a/boards/risc-v/esp32c3/common/include/esp32c3_board_spiflash.h
+++ b/boards/risc-v/esp32c3-legacy/common/include/esp32c3_board_spiflash.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * boards/risc-v/esp32c3/common/include/esp32c3_board_spiflash.h
+ * boards/risc-v/esp32c3-legacy/common/include/esp32c3_board_spiflash.h
  *
  * 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/esp32c3/common/include/esp32c3_board_spislavedev.h b/boards/risc-v/esp32c3-legacy/common/include/esp32c3_board_spislavedev.h
similarity index 97%
rename from boards/risc-v/esp32c3/common/include/esp32c3_board_spislavedev.h
rename to boards/risc-v/esp32c3-legacy/common/include/esp32c3_board_spislavedev.h
index b98f4b034ff..7dadf594a67 100644
--- a/boards/risc-v/esp32c3/common/include/esp32c3_board_spislavedev.h
+++ b/boards/risc-v/esp32c3-legacy/common/include/esp32c3_board_spislavedev.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * boards/risc-v/esp32c3/common/include/esp32c3_board_spislavedev.h
+ * boards/risc-v/esp32c3-legacy/common/include/esp32c3_board_spislavedev.h
  *
  * 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/esp32c3/common/include/esp32c3_board_twai.h b/boards/risc-v/esp32c3-legacy/common/include/esp32c3_board_twai.h
similarity index 97%
rename from boards/risc-v/esp32c3/common/include/esp32c3_board_twai.h
rename to boards/risc-v/esp32c3-legacy/common/include/esp32c3_board_twai.h
index 57b5b1f9428..7f94acf584d 100644
--- a/boards/risc-v/esp32c3/common/include/esp32c3_board_twai.h
+++ b/boards/risc-v/esp32c3-legacy/common/include/esp32c3_board_twai.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * boards/risc-v/esp32c3/common/include/esp32c3_board_twai.h
+ * boards/risc-v/esp32c3-legacy/common/include/esp32c3_board_twai.h
  *
  * 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/esp32c3/common/include/esp32c3_board_wdt.h b/boards/risc-v/esp32c3-legacy/common/include/esp32c3_board_wdt.h
similarity index 97%
rename from boards/risc-v/esp32c3/common/include/esp32c3_board_wdt.h
rename to boards/risc-v/esp32c3-legacy/common/include/esp32c3_board_wdt.h
index df7e89a071a..be072878bc4 100644
--- a/boards/risc-v/esp32c3/common/include/esp32c3_board_wdt.h
+++ b/boards/risc-v/esp32c3-legacy/common/include/esp32c3_board_wdt.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * boards/risc-v/esp32c3/common/include/esp32c3_board_wdt.h
+ * boards/risc-v/esp32c3-legacy/common/include/esp32c3_board_wdt.h
  *
  * 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/esp32c3/common/include/esp32c3_board_wlan.h b/boards/risc-v/esp32c3-legacy/common/include/esp32c3_board_wlan.h
similarity index 97%
rename from boards/risc-v/esp32c3/common/include/esp32c3_board_wlan.h
rename to boards/risc-v/esp32c3-legacy/common/include/esp32c3_board_wlan.h
index fdca410a6aa..493c31139ec 100644
--- a/boards/risc-v/esp32c3/common/include/esp32c3_board_wlan.h
+++ b/boards/risc-v/esp32c3-legacy/common/include/esp32c3_board_wlan.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * boards/risc-v/esp32c3/common/include/esp32c3_board_wlan.h
+ * boards/risc-v/esp32c3-legacy/common/include/esp32c3_board_wlan.h
  *
  * 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/esp32c3/common/kernel/Makefile b/boards/risc-v/esp32c3-legacy/common/kernel/Makefile
similarity index 98%
rename from boards/risc-v/esp32c3/common/kernel/Makefile
rename to boards/risc-v/esp32c3-legacy/common/kernel/Makefile
index c5b22e6a918..f3a2d84b0f3 100644
--- a/boards/risc-v/esp32c3/common/kernel/Makefile
+++ b/boards/risc-v/esp32c3-legacy/common/kernel/Makefile
@@ -1,5 +1,5 @@
 ############################################################################
-# boards/risc-v/esp32c3/esp32c3-devkit/kernel/Makefile
+# boards/risc-v/esp32c3-legacy/esp32c3-devkit/kernel/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/esp32c3/common/kernel/esp32c3_userspace.c b/boards/risc-v/esp32c3-legacy/common/kernel/esp32c3_userspace.c
similarity index 100%
rename from boards/risc-v/esp32c3/common/kernel/esp32c3_userspace.c
rename to boards/risc-v/esp32c3-legacy/common/kernel/esp32c3_userspace.c
diff --git a/boards/risc-v/esp32c3/common/scripts/.gitignore b/boards/risc-v/esp32c3-legacy/common/scripts/.gitignore
similarity index 100%
rename from boards/risc-v/esp32c3/common/scripts/.gitignore
rename to boards/risc-v/esp32c3-legacy/common/scripts/.gitignore
diff --git a/boards/risc-v/esp32c3/common/scripts/esp32c3_aliases.ld b/boards/risc-v/esp32c3-legacy/common/scripts/esp32c3_aliases.ld
similarity index 95%
rename from boards/risc-v/esp32c3/common/scripts/esp32c3_aliases.ld
rename to boards/risc-v/esp32c3-legacy/common/scripts/esp32c3_aliases.ld
index 9acf82c28b9..44c1b84b6ba 100644
--- a/boards/risc-v/esp32c3/common/scripts/esp32c3_aliases.ld
+++ b/boards/risc-v/esp32c3-legacy/common/scripts/esp32c3_aliases.ld
@@ -1,5 +1,5 @@
 /****************************************************************************
- * boards/risc-v/esp32c3/common/scripts/esp32c3_aliases.ld
+ * boards/risc-v/esp32c3-legacy/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/esp32c3/common/scripts/esp32c3_rom.ld b/boards/risc-v/esp32c3-legacy/common/scripts/esp32c3_rom.ld
similarity index 99%
rename from boards/risc-v/esp32c3/common/scripts/esp32c3_rom.ld
rename to boards/risc-v/esp32c3-legacy/common/scripts/esp32c3_rom.ld
index a14a6e5ff0b..8efd515925c 100644
--- a/boards/risc-v/esp32c3/common/scripts/esp32c3_rom.ld
+++ b/boards/risc-v/esp32c3-legacy/common/scripts/esp32c3_rom.ld
@@ -1,5 +1,5 @@
 /****************************************************************************
- * boards/risc-v/esp32c3/common/scripts/esp32c3_rom.ld
+ * boards/risc-v/esp32c3-legacy/common/scripts/esp32c3_rom.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/esp32c3/common/scripts/flat_memory.ld b/boards/risc-v/esp32c3-legacy/common/scripts/flat_memory.ld
similarity index 98%
rename from boards/risc-v/esp32c3/common/scripts/flat_memory.ld
rename to boards/risc-v/esp32c3-legacy/common/scripts/flat_memory.ld
index c0c79374578..f173923446d 100644
--- a/boards/risc-v/esp32c3/common/scripts/flat_memory.ld
+++ b/boards/risc-v/esp32c3-legacy/common/scripts/flat_memory.ld
@@ -1,5 +1,5 @@
 /****************************************************************************
- * boards/risc-v/esp32c3/common/scripts/flat_memory.ld
+ * boards/risc-v/esp32c3-legacy/common/scripts/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/esp32c3/common/scripts/kernel-space.ld b/boards/risc-v/esp32c3-legacy/common/scripts/kernel-space.ld
similarity index 98%
rename from boards/risc-v/esp32c3/common/scripts/kernel-space.ld
rename to boards/risc-v/esp32c3-legacy/common/scripts/kernel-space.ld
index 014ad10ecb0..92747c23d78 100644
--- a/boards/risc-v/esp32c3/common/scripts/kernel-space.ld
+++ b/boards/risc-v/esp32c3-legacy/common/scripts/kernel-space.ld
@@ -1,5 +1,5 @@
 /****************************************************************************
- * boards/risc-v/esp32c3/common/scripts/kernel-space.ld
+ * boards/risc-v/esp32c3-legacy/common/scripts/kernel-space.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/esp32c3/common/scripts/legacy_sections.ld b/boards/risc-v/esp32c3-legacy/common/scripts/legacy_sections.ld
similarity index 98%
rename from boards/risc-v/esp32c3/common/scripts/legacy_sections.ld
rename to boards/risc-v/esp32c3-legacy/common/scripts/legacy_sections.ld
index 41a03c4824c..19b3b8ca0c6 100644
--- a/boards/risc-v/esp32c3/common/scripts/legacy_sections.ld
+++ b/boards/risc-v/esp32c3-legacy/common/scripts/legacy_sections.ld
@@ -1,5 +1,5 @@
 /****************************************************************************
- * boards/risc-v/esp32c3/common/scripts/legacy_sections.ld
+ * boards/risc-v/esp32c3-legacy/common/scripts/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/esp32c3/common/scripts/mcuboot_sections.ld b/boards/risc-v/esp32c3-legacy/common/scripts/mcuboot_sections.ld
similarity index 99%
rename from boards/risc-v/esp32c3/common/scripts/mcuboot_sections.ld
rename to boards/risc-v/esp32c3-legacy/common/scripts/mcuboot_sections.ld
index 39f9666b962..cf6ab7123d6 100644
--- a/boards/risc-v/esp32c3/common/scripts/mcuboot_sections.ld
+++ b/boards/risc-v/esp32c3-legacy/common/scripts/mcuboot_sections.ld
@@ -1,5 +1,5 @@
 /****************************************************************************
- * boards/risc-v/esp32c3/common/scripts/mcuboot_sections.ld
+ * boards/risc-v/esp32c3-legacy/common/scripts/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/esp32c3/common/scripts/protected_memory.ld b/boards/risc-v/esp32c3-legacy/common/scripts/protected_memory.ld
similarity index 98%
rename from boards/risc-v/esp32c3/common/scripts/protected_memory.ld
rename to boards/risc-v/esp32c3-legacy/common/scripts/protected_memory.ld
index a0ec6dd626f..75872dea840 100644
--- a/boards/risc-v/esp32c3/common/scripts/protected_memory.ld
+++ b/boards/risc-v/esp32c3-legacy/common/scripts/protected_memory.ld
@@ -1,5 +1,5 @@
 /****************************************************************************
- * boards/risc-v/esp32c3/common/scripts/protected_memory.ld
+ * boards/risc-v/esp32c3-legacy/common/scripts/protected_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/esp32c3/common/scripts/user-space.ld b/boards/risc-v/esp32c3-legacy/common/scripts/user-space.ld
similarity index 98%
rename from boards/risc-v/esp32c3/common/scripts/user-space.ld
rename to boards/risc-v/esp32c3-legacy/common/scripts/user-space.ld
index 543bac4a134..4696757232f 100644
--- a/boards/risc-v/esp32c3/common/scripts/user-space.ld
+++ b/boards/risc-v/esp32c3-legacy/common/scripts/user-space.ld
@@ -1,5 +1,5 @@
 /****************************************************************************
- * boards/risc-v/esp32c3/common/scripts/user-space.ld
+ * boards/risc-v/esp32c3-legacy/common/scripts/user-space.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/esp32c3/common/src/Make.defs b/boards/risc-v/esp32c3-legacy/common/src/Make.defs
similarity index 97%
rename from boards/risc-v/esp32c3/common/src/Make.defs
rename to boards/risc-v/esp32c3-legacy/common/src/Make.defs
index 571977ba284..25cdfc2e1cb 100644
--- a/boards/risc-v/esp32c3/common/src/Make.defs
+++ b/boards/risc-v/esp32c3-legacy/common/src/Make.defs
@@ -1,5 +1,5 @@
 #############################################################################
-# boards/risc-v/esp32c3/common/src/Make.defs
+# boards/risc-v/esp32c3-legacy/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/esp32c3/common/src/esp32c3_board_adc.c b/boards/risc-v/esp32c3-legacy/common/src/esp32c3_board_adc.c
similarity index 98%
rename from boards/risc-v/esp32c3/common/src/esp32c3_board_adc.c
rename to boards/risc-v/esp32c3-legacy/common/src/esp32c3_board_adc.c
index 15c418eeda5..f5d4dddd4d3 100644
--- a/boards/risc-v/esp32c3/common/src/esp32c3_board_adc.c
+++ b/boards/risc-v/esp32c3-legacy/common/src/esp32c3_board_adc.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * boards/risc-v/esp32c3/common/src/esp32c3_board_adc.c
+ * boards/risc-v/esp32c3-legacy/common/src/esp32c3_board_adc.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/esp32c3/common/src/esp32c3_board_apa102.c b/boards/risc-v/esp32c3-legacy/common/src/esp32c3_board_apa102.c
similarity index 98%
rename from boards/risc-v/esp32c3/common/src/esp32c3_board_apa102.c
rename to boards/risc-v/esp32c3-legacy/common/src/esp32c3_board_apa102.c
index afa4e7efad0..a900146c6af 100644
--- a/boards/risc-v/esp32c3/common/src/esp32c3_board_apa102.c
+++ b/boards/risc-v/esp32c3-legacy/common/src/esp32c3_board_apa102.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * boards/risc-v/esp32c3/common/src/esp32c3_board_apa102.c
+ * boards/risc-v/esp32c3-legacy/common/src/esp32c3_board_apa102.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/esp32c3/common/src/esp32c3_board_apds9960.c b/boards/risc-v/esp32c3-legacy/common/src/esp32c3_board_apds9960.c
similarity index 98%
rename from boards/risc-v/esp32c3/common/src/esp32c3_board_apds9960.c
rename to boards/risc-v/esp32c3-legacy/common/src/esp32c3_board_apds9960.c
index fb34f345ab1..d013f868d50 100644
--- a/boards/risc-v/esp32c3/common/src/esp32c3_board_apds9960.c
+++ b/boards/risc-v/esp32c3-legacy/common/src/esp32c3_board_apds9960.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * boards/risc-v/esp32c3/common/src/esp32c3_board_apds9960.c
+ * boards/risc-v/esp32c3-legacy/common/src/esp32c3_board_apds9960.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/esp32c3/common/src/esp32c3_board_bmp180.c b/boards/risc-v/esp32c3-legacy/common/src/esp32c3_board_bmp180.c
similarity index 97%
rename from boards/risc-v/esp32c3/common/src/esp32c3_board_bmp180.c
rename to boards/risc-v/esp32c3-legacy/common/src/esp32c3_board_bmp180.c
index 8acba5655d8..9f223bbac89 100644
--- a/boards/risc-v/esp32c3/common/src/esp32c3_board_bmp180.c
+++ b/boards/risc-v/esp32c3-legacy/common/src/esp32c3_board_bmp180.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * boards/risc-v/esp32c3/common/src/esp32c3_board_bmp180.c
+ * boards/risc-v/esp32c3-legacy/common/src/esp32c3_board_bmp180.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/esp32c3/common/src/esp32c3_board_gc9a01.c b/boards/risc-v/esp32c3-legacy/common/src/esp32c3_board_gc9a01.c
similarity index 98%
rename from boards/risc-v/esp32c3/common/src/esp32c3_board_gc9a01.c
rename to boards/risc-v/esp32c3-legacy/common/src/esp32c3_board_gc9a01.c
index 285620cfcd1..758adc00991 100644
--- a/boards/risc-v/esp32c3/common/src/esp32c3_board_gc9a01.c
+++ b/boards/risc-v/esp32c3-legacy/common/src/esp32c3_board_gc9a01.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * boards/risc-v/esp32c3/common/src/esp32c3_board_gc9a01.c
+ * boards/risc-v/esp32c3-legacy/common/src/esp32c3_board_gc9a01.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/esp32c3/common/src/esp32c3_board_i2c.c b/boards/risc-v/esp32c3-legacy/common/src/esp32c3_board_i2c.c
similarity index 97%
rename from boards/risc-v/esp32c3/common/src/esp32c3_board_i2c.c
rename to boards/risc-v/esp32c3-legacy/common/src/esp32c3_board_i2c.c
index 6ad33d61ab5..1d8b351d00c 100644
--- a/boards/risc-v/esp32c3/common/src/esp32c3_board_i2c.c
+++ b/boards/risc-v/esp32c3-legacy/common/src/esp32c3_board_i2c.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * boards/risc-v/esp32c3/common/src/esp32c3_board_i2c.c
+ * boards/risc-v/esp32c3-legacy/common/src/esp32c3_board_i2c.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/esp32c3/common/src/esp32c3_board_ledc.c b/boards/risc-v/esp32c3-legacy/common/src/esp32c3_board_ledc.c
similarity index 98%
rename from boards/risc-v/esp32c3/common/src/esp32c3_board_ledc.c
rename to boards/risc-v/esp32c3-legacy/common/src/esp32c3_board_ledc.c
index 835430b934d..65f7c983be4 100644
--- a/boards/risc-v/esp32c3/common/src/esp32c3_board_ledc.c
+++ b/boards/risc-v/esp32c3-legacy/common/src/esp32c3_board_ledc.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * boards/risc-v/esp32c3/common/src/esp32c3_board_ledc.c
+ * boards/risc-v/esp32c3-legacy/common/src/esp32c3_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/esp32c3/common/src/esp32c3_board_mpu60x0_i2c.c b/boards/risc-v/esp32c3-legacy/common/src/esp32c3_board_mpu60x0_i2c.c
similarity index 97%
rename from boards/risc-v/esp32c3/common/src/esp32c3_board_mpu60x0_i2c.c
rename to boards/risc-v/esp32c3-legacy/common/src/esp32c3_board_mpu60x0_i2c.c
index a64e7362558..a321085c5d3 100644
--- a/boards/risc-v/esp32c3/common/src/esp32c3_board_mpu60x0_i2c.c
+++ b/boards/risc-v/esp32c3-legacy/common/src/esp32c3_board_mpu60x0_i2c.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * boards/risc-v/esp32c3/common/src/esp32c3_board_mpu60x0_i2c.c
+ * boards/risc-v/esp32c3-legacy/common/src/esp32c3_board_mpu60x0_i2c.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/esp32c3/common/src/esp32c3_board_oneshot.c b/boards/risc-v/esp32c3-legacy/common/src/esp32c3_board_oneshot.c
similarity index 97%
rename from boards/risc-v/esp32c3/common/src/esp32c3_board_oneshot.c
rename to boards/risc-v/esp32c3-legacy/common/src/esp32c3_board_oneshot.c
index ada850f6829..709bd662698 100644
--- a/boards/risc-v/esp32c3/common/src/esp32c3_board_oneshot.c
+++ b/boards/risc-v/esp32c3-legacy/common/src/esp32c3_board_oneshot.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * boards/risc-v/esp32c3/common/src/esp32c3_board_oneshot.c
+ * boards/risc-v/esp32c3-legacy/common/src/esp32c3_board_oneshot.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/esp32c3/common/src/esp32c3_board_spi.c b/boards/risc-v/esp32c3-legacy/common/src/esp32c3_board_spi.c
similarity index 97%
rename from boards/risc-v/esp32c3/common/src/esp32c3_board_spi.c
rename to boards/risc-v/esp32c3-legacy/common/src/esp32c3_board_spi.c
index b29b822eefc..3e54fdfbc4c 100644
--- a/boards/risc-v/esp32c3/common/src/esp32c3_board_spi.c
+++ b/boards/risc-v/esp32c3-legacy/common/src/esp32c3_board_spi.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * boards/risc-v/esp32c3/common/src/esp32c3_board_spi.c
+ * boards/risc-v/esp32c3-legacy/common/src/esp32c3_board_spi.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/esp32c3/common/src/esp32c3_board_spidev.c b/boards/risc-v/esp32c3-legacy/common/src/esp32c3_board_spidev.c
similarity index 97%
rename from boards/risc-v/esp32c3/common/src/esp32c3_board_spidev.c
rename to boards/risc-v/esp32c3-legacy/common/src/esp32c3_board_spidev.c
index 834b72fdb85..b858a6ad091 100644
--- a/boards/risc-v/esp32c3/common/src/esp32c3_board_spidev.c
+++ b/boards/risc-v/esp32c3-legacy/common/src/esp32c3_board_spidev.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * boards/risc-v/esp32c3/common/src/esp32c3_board_spidev.c
+ * boards/risc-v/esp32c3-legacy/common/src/esp32c3_board_spidev.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/esp32c3/common/src/esp32c3_board_spiflash.c b/boards/risc-v/esp32c3-legacy/common/src/esp32c3_board_spiflash.c
similarity index 99%
rename from boards/risc-v/esp32c3/common/src/esp32c3_board_spiflash.c
rename to boards/risc-v/esp32c3-legacy/common/src/esp32c3_board_spiflash.c
index 4b4a0ea9d2c..9aecca8c1ae 100644
--- a/boards/risc-v/esp32c3/common/src/esp32c3_board_spiflash.c
+++ b/boards/risc-v/esp32c3-legacy/common/src/esp32c3_board_spiflash.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * boards/risc-v/esp32c3/common/src/esp32c3_board_spiflash.c
+ * boards/risc-v/esp32c3-legacy/common/src/esp32c3_board_spiflash.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/esp32c3/common/src/esp32c3_board_spislavedev.c b/boards/risc-v/esp32c3-legacy/common/src/esp32c3_board_spislavedev.c
similarity index 97%
rename from boards/risc-v/esp32c3/common/src/esp32c3_board_spislavedev.c
rename to boards/risc-v/esp32c3-legacy/common/src/esp32c3_board_spislavedev.c
index c6721661df0..199109c4bb2 100644
--- a/boards/risc-v/esp32c3/common/src/esp32c3_board_spislavedev.c
+++ b/boards/risc-v/esp32c3-legacy/common/src/esp32c3_board_spislavedev.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * boards/risc-v/esp32c3/common/src/esp32c3_board_spislavedev.c
+ * boards/risc-v/esp32c3-legacy/common/src/esp32c3_board_spislavedev.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/esp32c3/common/src/esp32c3_board_st7735.c b/boards/risc-v/esp32c3-legacy/common/src/esp32c3_board_st7735.c
similarity index 98%
rename from boards/risc-v/esp32c3/common/src/esp32c3_board_st7735.c
rename to boards/risc-v/esp32c3-legacy/common/src/esp32c3_board_st7735.c
index d2f40dad06e..9e8bc3f7cfc 100644
--- a/boards/risc-v/esp32c3/common/src/esp32c3_board_st7735.c
+++ b/boards/risc-v/esp32c3-legacy/common/src/esp32c3_board_st7735.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * boards/risc-v/esp32c3/common/src/esp32c3_board_st7735.c
+ * boards/risc-v/esp32c3-legacy/common/src/esp32c3_board_st7735.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/esp32c3/common/src/esp32c3_board_st7789.c b/boards/risc-v/esp32c3-legacy/common/src/esp32c3_board_st7789.c
similarity index 98%
rename from boards/risc-v/esp32c3/common/src/esp32c3_board_st7789.c
rename to boards/risc-v/esp32c3-legacy/common/src/esp32c3_board_st7789.c
index 99c82855c75..8a53f5bb453 100644
--- a/boards/risc-v/esp32c3/common/src/esp32c3_board_st7789.c
+++ b/boards/risc-v/esp32c3-legacy/common/src/esp32c3_board_st7789.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * boards/risc-v/esp32c3/common/src/esp32c3_board_st7789.c
+ * boards/risc-v/esp32c3-legacy/common/src/esp32c3_board_st7789.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/esp32c3/common/src/esp32c3_board_twai.c b/boards/risc-v/esp32c3-legacy/common/src/esp32c3_board_twai.c
similarity index 97%
rename from boards/risc-v/esp32c3/common/src/esp32c3_board_twai.c
rename to boards/risc-v/esp32c3-legacy/common/src/esp32c3_board_twai.c
index 2e80ab043ab..62bf5b38539 100644
--- a/boards/risc-v/esp32c3/common/src/esp32c3_board_twai.c
+++ b/boards/risc-v/esp32c3-legacy/common/src/esp32c3_board_twai.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * boards/risc-v/esp32c3/common/src/esp32c3_board_twai.c
+ * boards/risc-v/esp32c3-legacy/common/src/esp32c3_board_twai.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/esp32c3/common/src/esp32c3_board_wdt.c b/boards/risc-v/esp32c3-legacy/common/src/esp32c3_board_wdt.c
similarity index 97%
rename from boards/risc-v/esp32c3/common/src/esp32c3_board_wdt.c
rename to boards/risc-v/esp32c3-legacy/common/src/esp32c3_board_wdt.c
index fead26bdb30..ac82af01e83 100644
--- a/boards/risc-v/esp32c3/common/src/esp32c3_board_wdt.c
+++ b/boards/risc-v/esp32c3-legacy/common/src/esp32c3_board_wdt.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * boards/risc-v/esp32c3/common/src/esp32c3_board_wdt.c
+ * boards/risc-v/esp32c3-legacy/common/src/esp32c3_board_wdt.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/esp32c3/common/src/esp32c3_board_wlan.c b/boards/risc-v/esp32c3-legacy/common/src/esp32c3_board_wlan.c
similarity index 97%
rename from boards/risc-v/esp32c3/common/src/esp32c3_board_wlan.c
rename to boards/risc-v/esp32c3-legacy/common/src/esp32c3_board_wlan.c
index 35b621eafbb..9a19fdf361a 100644
--- a/boards/risc-v/esp32c3/common/src/esp32c3_board_wlan.c
+++ b/boards/risc-v/esp32c3-legacy/common/src/esp32c3_board_wlan.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * boards/risc-v/esp32c3/common/src/esp32c3_board_wlan.c
+ * boards/risc-v/esp32c3-legacy/common/src/esp32c3_board_wlan.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/esp32c3/esp32c3-devkit-rust-1/Kconfig b/boards/risc-v/esp32c3-legacy/esp32c3-devkit-rust-1/Kconfig
similarity index 100%
rename from boards/risc-v/esp32c3/esp32c3-devkit-rust-1/Kconfig
rename to boards/risc-v/esp32c3-legacy/esp32c3-devkit-rust-1/Kconfig
diff --git a/boards/risc-v/esp32c3/esp32c3-devkit-rust-1/configs/brickmatch/defconfig b/boards/risc-v/esp32c3-legacy/esp32c3-devkit-rust-1/configs/brickmatch/defconfig
similarity index 98%
rename from boards/risc-v/esp32c3/esp32c3-devkit-rust-1/configs/brickmatch/defconfig
rename to boards/risc-v/esp32c3-legacy/esp32c3-devkit-rust-1/configs/brickmatch/defconfig
index f4f86c45d11..2dabaed38ff 100644
--- a/boards/risc-v/esp32c3/esp32c3-devkit-rust-1/configs/brickmatch/defconfig
+++ b/boards/risc-v/esp32c3-legacy/esp32c3-devkit-rust-1/configs/brickmatch/defconfig
@@ -12,7 +12,7 @@ CONFIG_ARCH="risc-v"
 CONFIG_ARCH_BOARD="esp32c3-devkit-rust-1"
 CONFIG_ARCH_BOARD_COMMON=y
 CONFIG_ARCH_BOARD_ESP32C3_DEVKIT_RUST1=y
-CONFIG_ARCH_CHIP="esp32c3"
+CONFIG_ARCH_CHIP="esp32c3-legacy"
 CONFIG_ARCH_CHIP_ESP32C3=y
 CONFIG_ARCH_CHIP_ESP32C3MINI1=y
 CONFIG_ARCH_INTERRUPTSTACK=1536
diff --git a/boards/risc-v/esp32c3/esp32c3-devkit-rust-1/configs/nsh/defconfig b/boards/risc-v/esp32c3-legacy/esp32c3-devkit-rust-1/configs/nsh/defconfig
similarity index 97%
rename from boards/risc-v/esp32c3/esp32c3-devkit-rust-1/configs/nsh/defconfig
rename to boards/risc-v/esp32c3-legacy/esp32c3-devkit-rust-1/configs/nsh/defconfig
index c4a9babc85c..867a40fd22e 100644
--- a/boards/risc-v/esp32c3/esp32c3-devkit-rust-1/configs/nsh/defconfig
+++ b/boards/risc-v/esp32c3-legacy/esp32c3-devkit-rust-1/configs/nsh/defconfig
@@ -11,7 +11,7 @@
 CONFIG_ARCH="risc-v"
 CONFIG_ARCH_BOARD="esp32c3-devkit-rust-1"
 CONFIG_ARCH_BOARD_ESP32C3_DEVKIT_RUST1=y
-CONFIG_ARCH_CHIP="esp32c3"
+CONFIG_ARCH_CHIP="esp32c3-legacy"
 CONFIG_ARCH_CHIP_ESP32C3=y
 CONFIG_ARCH_CHIP_ESP32C3MINI1=y
 CONFIG_ARCH_INTERRUPTSTACK=1536
diff --git a/boards/risc-v/esp32c3/esp32c3-devkit-rust-1/include/board.h b/boards/risc-v/esp32c3-legacy/esp32c3-devkit-rust-1/include/board.h
similarity index 96%
rename from boards/risc-v/esp32c3/esp32c3-devkit-rust-1/include/board.h
rename to boards/risc-v/esp32c3-legacy/esp32c3-devkit-rust-1/include/board.h
index a0a65c219cb..a14d51ac10a 100644
--- a/boards/risc-v/esp32c3/esp32c3-devkit-rust-1/include/board.h
+++ b/boards/risc-v/esp32c3-legacy/esp32c3-devkit-rust-1/include/board.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * boards/risc-v/esp32c3/esp32c3-devkit-rust-1/include/board.h
+ * boards/risc-v/esp32c3-legacy/esp32c3-devkit-rust-1/include/board.h
  *
  * 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/esp32c3/esp32c3-devkit-rust-1/include/board_memorymap.h b/boards/risc-v/esp32c3-legacy/esp32c3-devkit-rust-1/include/board_memorymap.h
similarity index 100%
rename from boards/risc-v/esp32c3/esp32c3-devkit-rust-1/include/board_memorymap.h
rename to boards/risc-v/esp32c3-legacy/esp32c3-devkit-rust-1/include/board_memorymap.h
diff --git a/boards/risc-v/esp32c3/esp32c3-devkit-rust-1/scripts/Make.defs b/boards/risc-v/esp32c3-legacy/esp32c3-devkit-rust-1/scripts/Make.defs
similarity index 97%
rename from boards/risc-v/esp32c3/esp32c3-devkit-rust-1/scripts/Make.defs
rename to boards/risc-v/esp32c3-legacy/esp32c3-devkit-rust-1/scripts/Make.defs
index 9e40d54f624..0ffdde4108b 100644
--- a/boards/risc-v/esp32c3/esp32c3-devkit-rust-1/scripts/Make.defs
+++ b/boards/risc-v/esp32c3-legacy/esp32c3-devkit-rust-1/scripts/Make.defs
@@ -1,5 +1,5 @@
 ############################################################################
-# boards/risc-v/esp32c3/esp32c3-devkit-rust-1/scripts/Make.defs
+# boards/risc-v/esp32c3-legacy/esp32c3-devkit-rust-1/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/esp32c3/esp32c3-devkit-rust-1/src/Make.defs b/boards/risc-v/esp32c3-legacy/esp32c3-devkit-rust-1/src/Make.defs
similarity index 95%
rename from boards/risc-v/esp32c3/esp32c3-devkit-rust-1/src/Make.defs
rename to boards/risc-v/esp32c3-legacy/esp32c3-devkit-rust-1/src/Make.defs
index ee830b674d6..64711f659bd 100644
--- a/boards/risc-v/esp32c3/esp32c3-devkit-rust-1/src/Make.defs
+++ b/boards/risc-v/esp32c3-legacy/esp32c3-devkit-rust-1/src/Make.defs
@@ -1,5 +1,5 @@
 #############################################################################
-# boards/risc-v/esp32c3/esp32c3-devkit-rust-1/src/Makefile
+# boards/risc-v/esp32c3-legacy/esp32c3-devkit-rust-1/src/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/esp32c3/esp32c3-devkit-rust-1/src/esp32c3-devkit-rust-1.h b/boards/risc-v/esp32c3-legacy/esp32c3-devkit-rust-1/src/esp32c3-devkit-rust-1.h
similarity index 100%
rename from boards/risc-v/esp32c3/esp32c3-devkit-rust-1/src/esp32c3-devkit-rust-1.h
rename to boards/risc-v/esp32c3-legacy/esp32c3-devkit-rust-1/src/esp32c3-devkit-rust-1.h
diff --git a/boards/risc-v/esp32c3/esp32c3-devkit-rust-1/src/esp32c3_appinit.c b/boards/risc-v/esp32c3-legacy/esp32c3-devkit-rust-1/src/esp32c3_appinit.c
similarity index 97%
rename from boards/risc-v/esp32c3/esp32c3-devkit-rust-1/src/esp32c3_appinit.c
rename to boards/risc-v/esp32c3-legacy/esp32c3-devkit-rust-1/src/esp32c3_appinit.c
index d015d58a45f..bef1068289b 100644
--- a/boards/risc-v/esp32c3/esp32c3-devkit-rust-1/src/esp32c3_appinit.c
+++ b/boards/risc-v/esp32c3-legacy/esp32c3-devkit-rust-1/src/esp32c3_appinit.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * boards/risc-v/esp32c3/esp32c3-devkit-rust-1/src/esp32c3_appinit.c
+ * boards/risc-v/esp32c3-legacy/esp32c3-devkit-rust-1/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/esp32c3/esp32c3-devkit-rust-1/src/esp32c3_autoleds.c b/boards/risc-v/esp32c3-legacy/esp32c3-devkit-rust-1/src/esp32c3_autoleds.c
similarity index 97%
rename from boards/risc-v/esp32c3/esp32c3-devkit-rust-1/src/esp32c3_autoleds.c
rename to boards/risc-v/esp32c3-legacy/esp32c3-devkit-rust-1/src/esp32c3_autoleds.c
index 55c0c8e86ea..0e1acfd2df6 100644
--- a/boards/risc-v/esp32c3/esp32c3-devkit-rust-1/src/esp32c3_autoleds.c
+++ b/boards/risc-v/esp32c3-legacy/esp32c3-devkit-rust-1/src/esp32c3_autoleds.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * boards/risc-v/esp32c3/esp32c3-devkit-rust-1/src/esp32c3_autoleds.c
+ * boards/risc-v/esp32c3-legacy/esp32c3-devkit-rust-1/src/esp32c3_autoleds.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/esp32c3/esp32c3-devkit-rust-1/src/esp32c3_boot.c b/boards/risc-v/esp32c3-legacy/esp32c3-devkit-rust-1/src/esp32c3_boot.c
similarity index 97%
rename from boards/risc-v/esp32c3/esp32c3-devkit-rust-1/src/esp32c3_boot.c
rename to boards/risc-v/esp32c3-legacy/esp32c3-devkit-rust-1/src/esp32c3_boot.c
index 1057370794f..33c8a5d4505 100644
--- a/boards/risc-v/esp32c3/esp32c3-devkit-rust-1/src/esp32c3_boot.c
+++ b/boards/risc-v/esp32c3-legacy/esp32c3-devkit-rust-1/src/esp32c3_boot.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * boards/risc-v/esp32c3/esp32c3-devkit-rust-1/src/esp32c3_boot.c
+ * boards/risc-v/esp32c3-legacy/esp32c3-devkit-rust-1/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/esp32c3/esp32c3-devkit-rust-1/src/esp32c3_bringup.c b/boards/risc-v/esp32c3-legacy/esp32c3-devkit-rust-1/src/esp32c3_bringup.c
similarity index 98%
rename from boards/risc-v/esp32c3/esp32c3-devkit-rust-1/src/esp32c3_bringup.c
rename to boards/risc-v/esp32c3-legacy/esp32c3-devkit-rust-1/src/esp32c3_bringup.c
index 638c2dc34ae..ac8257210e8 100644
--- a/boards/risc-v/esp32c3/esp32c3-devkit-rust-1/src/esp32c3_bringup.c
+++ b/boards/risc-v/esp32c3-legacy/esp32c3-devkit-rust-1/src/esp32c3_bringup.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * boards/risc-v/esp32c3/esp32c3-devkit-rust-1/src/esp32c3_bringup.c
+ * boards/risc-v/esp32c3-legacy/esp32c3-devkit-rust-1/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/esp32c3/esp32c3-devkit/src/esp32c3_ioctl.c b/boards/risc-v/esp32c3-legacy/esp32c3-devkit-rust-1/src/esp32c3_ioctl.c
similarity index 97%
rename from boards/risc-v/esp32c3/esp32c3-devkit/src/esp32c3_ioctl.c
rename to boards/risc-v/esp32c3-legacy/esp32c3-devkit-rust-1/src/esp32c3_ioctl.c
index 54579a8c3a7..636b09cbe91 100644
--- a/boards/risc-v/esp32c3/esp32c3-devkit/src/esp32c3_ioctl.c
+++ b/boards/risc-v/esp32c3-legacy/esp32c3-devkit-rust-1/src/esp32c3_ioctl.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * boards/risc-v/esp32c3/esp32c3-devkit/src/esp32c3_ioctl.c
+ * boards/risc-v/esp32c3-legacy/esp32c3-devkit-rust-1/src/esp32c3_ioctl.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/esp32c3/esp32c3-devkit/src/esp32c3_reset.c b/boards/risc-v/esp32c3-legacy/esp32c3-devkit-rust-1/src/esp32c3_reset.c
similarity index 97%
rename from boards/risc-v/esp32c3/esp32c3-devkit/src/esp32c3_reset.c
rename to boards/risc-v/esp32c3-legacy/esp32c3-devkit-rust-1/src/esp32c3_reset.c
index ad7059cbfe1..9d627271649 100644
--- a/boards/risc-v/esp32c3/esp32c3-devkit/src/esp32c3_reset.c
+++ b/boards/risc-v/esp32c3-legacy/esp32c3-devkit-rust-1/src/esp32c3_reset.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * boards/risc-v/esp32c3/esp32c3-devkit/src/esp32c3_reset.c
+ * boards/risc-v/esp32c3-legacy/esp32c3-devkit-rust-1/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/esp32c3/esp32c3-devkit/Kconfig b/boards/risc-v/esp32c3-legacy/esp32c3-devkit/Kconfig
similarity index 100%
rename from boards/risc-v/esp32c3/esp32c3-devkit/Kconfig
rename to boards/risc-v/esp32c3-legacy/esp32c3-devkit/Kconfig
diff --git a/boards/risc-v/esp32c3/esp32c3-devkit/configs/adc/defconfig b/boards/risc-v/esp32c3-legacy/esp32c3-devkit/configs/adc/defconfig
similarity index 97%
rename from boards/risc-v/esp32c3/esp32c3-devkit/configs/adc/defconfig
rename to boards/risc-v/esp32c3-legacy/esp32c3-devkit/configs/adc/defconfig
index d532e71d115..ef808f2b18f 100644
--- a/boards/risc-v/esp32c3/esp32c3-devkit/configs/adc/defconfig
+++ b/boards/risc-v/esp32c3-legacy/esp32c3-devkit/configs/adc/defconfig
@@ -11,7 +11,7 @@ CONFIG_ARCH="risc-v"
 CONFIG_ARCH_BOARD="esp32c3-devkit"
 CONFIG_ARCH_BOARD_COMMON=y
 CONFIG_ARCH_BOARD_ESP32C3_DEVKIT=y
-CONFIG_ARCH_CHIP="esp32c3"
+CONFIG_ARCH_CHIP="esp32c3-legacy"
 CONFIG_ARCH_CHIP_ESP32C3=y
 CONFIG_ARCH_CHIP_ESP32C3WROOM02=y
 CONFIG_ARCH_INTERRUPTSTACK=1536
diff --git a/boards/risc-v/esp32c3/esp32c3-devkit/configs/autopm/defconfig b/boards/risc-v/esp32c3-legacy/esp32c3-devkit/configs/autopm/defconfig
similarity index 98%
rename from boards/risc-v/esp32c3/esp32c3-devkit/configs/autopm/defconfig
rename to boards/risc-v/esp32c3-legacy/esp32c3-devkit/configs/autopm/defconfig
index 10551337083..9ab50dead07 100644
--- a/boards/risc-v/esp32c3/esp32c3-devkit/configs/autopm/defconfig
+++ b/boards/risc-v/esp32c3-legacy/esp32c3-devkit/configs/autopm/defconfig
@@ -11,7 +11,7 @@ CONFIG_ARCH="risc-v"
 CONFIG_ARCH_BOARD="esp32c3-devkit"
 CONFIG_ARCH_BOARD_COMMON=y
 CONFIG_ARCH_BOARD_ESP32C3_DEVKIT=y
-CONFIG_ARCH_CHIP="esp32c3"
+CONFIG_ARCH_CHIP="esp32c3-legacy"
 CONFIG_ARCH_CHIP_ESP32C3=y
 CONFIG_ARCH_CHIP_ESP32C3WROOM02=y
 CONFIG_ARCH_INTERRUPTSTACK=1536
diff --git a/boards/risc-v/esp32c3/esp32c3-devkit/configs/ble/defconfig b/boards/risc-v/esp32c3-legacy/esp32c3-devkit/configs/ble/defconfig
similarity index 97%
rename from boards/risc-v/esp32c3/esp32c3-devkit/configs/ble/defconfig
rename to boards/risc-v/esp32c3-legacy/esp32c3-devkit/configs/ble/defconfig
index 33db79264f8..425c8fe3ddb 100644
--- a/boards/risc-v/esp32c3/esp32c3-devkit/configs/ble/defconfig
+++ b/boards/risc-v/esp32c3-legacy/esp32c3-devkit/configs/ble/defconfig
@@ -10,7 +10,7 @@ CONFIG_ARCH="risc-v"
 CONFIG_ARCH_BOARD="esp32c3-devkit"
 CONFIG_ARCH_BOARD_COMMON=y
 CONFIG_ARCH_BOARD_ESP32C3_DEVKIT=y
-CONFIG_ARCH_CHIP="esp32c3"
+CONFIG_ARCH_CHIP="esp32c3-legacy"
 CONFIG_ARCH_CHIP_ESP32C3=y
 CONFIG_ARCH_CHIP_ESP32C3WROOM02=y
 CONFIG_ARCH_INTERRUPTSTACK=1536
diff --git a/boards/risc-v/esp32c3/esp32c3-devkit/configs/bmp180/defconfig b/boards/risc-v/esp32c3-legacy/esp32c3-devkit/configs/bmp180/defconfig
similarity index 97%
rename from boards/risc-v/esp32c3/esp32c3-devkit/configs/bmp180/defconfig
rename to boards/risc-v/esp32c3-legacy/esp32c3-devkit/configs/bmp180/defconfig
index 9c093552c53..a64d7e2a4d1 100644
--- a/boards/risc-v/esp32c3/esp32c3-devkit/configs/bmp180/defconfig
+++ b/boards/risc-v/esp32c3-legacy/esp32c3-devkit/configs/bmp180/defconfig
@@ -11,7 +11,7 @@ CONFIG_ARCH="risc-v"
 CONFIG_ARCH_BOARD="esp32c3-devkit"
 CONFIG_ARCH_BOARD_COMMON=y
 CONFIG_ARCH_BOARD_ESP32C3_DEVKIT=y
-CONFIG_ARCH_CHIP="esp32c3"
+CONFIG_ARCH_CHIP="esp32c3-legacy"
 CONFIG_ARCH_CHIP_ESP32C3=y
 CONFIG_ARCH_CHIP_ESP32C3WROOM02=y
 CONFIG_ARCH_INTERRUPTSTACK=1536
diff --git a/boards/risc-v/esp32c3/esp32c3-devkit/configs/coremark/defconfig b/boards/risc-v/esp32c3-legacy/esp32c3-devkit/configs/coremark/defconfig
similarity index 96%
rename from boards/risc-v/esp32c3/esp32c3-devkit/configs/coremark/defconfig
rename to boards/risc-v/esp32c3-legacy/esp32c3-devkit/configs/coremark/defconfig
index bddc8c8a837..235c755bdbd 100644
--- a/boards/risc-v/esp32c3/esp32c3-devkit/configs/coremark/defconfig
+++ b/boards/risc-v/esp32c3-legacy/esp32c3-devkit/configs/coremark/defconfig
@@ -10,7 +10,7 @@ CONFIG_ARCH="risc-v"
 CONFIG_ARCH_BOARD="esp32c3-devkit"
 CONFIG_ARCH_BOARD_COMMON=y
 CONFIG_ARCH_BOARD_ESP32C3_DEVKIT=y
-CONFIG_ARCH_CHIP="esp32c3"
+CONFIG_ARCH_CHIP="esp32c3-legacy"
 CONFIG_ARCH_CHIP_ESP32C3=y
 CONFIG_ARCH_CHIP_ESP32C3WROOM02=y
 CONFIG_ARCH_INTERRUPTSTACK=1536
diff --git a/boards/risc-v/esp32c3/esp32c3-devkit/configs/crypto/defconfig b/boards/risc-v/esp32c3-legacy/esp32c3-devkit/configs/crypto/defconfig
similarity index 97%
rename from boards/risc-v/esp32c3/esp32c3-devkit/configs/crypto/defconfig
rename to boards/risc-v/esp32c3-legacy/esp32c3-devkit/configs/crypto/defconfig
index 6deea2d8807..75b791c7db6 100644
--- a/boards/risc-v/esp32c3/esp32c3-devkit/configs/crypto/defconfig
+++ b/boards/risc-v/esp32c3-legacy/esp32c3-devkit/configs/crypto/defconfig
@@ -11,7 +11,7 @@ CONFIG_ALLOW_BSD_COMPONENTS=y
 CONFIG_ARCH="risc-v"
 CONFIG_ARCH_BOARD="esp32c3-devkit"
 CONFIG_ARCH_BOARD_ESP32C3_DEVKIT=y
-CONFIG_ARCH_CHIP="esp32c3"
+CONFIG_ARCH_CHIP="esp32c3-legacy"
 CONFIG_ARCH_CHIP_ESP32C3=y
 CONFIG_ARCH_CHIP_ESP32C3WROOM02=y
 CONFIG_ARCH_INTERRUPTSTACK=1536
diff --git a/boards/risc-v/esp32c3/esp32c3-devkit/configs/cxx/defconfig b/boards/risc-v/esp32c3-legacy/esp32c3-devkit/configs/cxx/defconfig
similarity index 97%
rename from boards/risc-v/esp32c3/esp32c3-devkit/configs/cxx/defconfig
rename to boards/risc-v/esp32c3-legacy/esp32c3-devkit/configs/cxx/defconfig
index 2d8b34cc2e2..bee6917a4fc 100644
--- a/boards/risc-v/esp32c3/esp32c3-devkit/configs/cxx/defconfig
+++ b/boards/risc-v/esp32c3-legacy/esp32c3-devkit/configs/cxx/defconfig
@@ -11,7 +11,7 @@ CONFIG_ARCH="risc-v"
 CONFIG_ARCH_BOARD="esp32c3-devkit"
 CONFIG_ARCH_BOARD_COMMON=y
 CONFIG_ARCH_BOARD_ESP32C3_DEVKIT=y
-CONFIG_ARCH_CHIP="esp32c3"
+CONFIG_ARCH_CHIP="esp32c3-legacy"
 CONFIG_ARCH_CHIP_ESP32C3=y
 CONFIG_ARCH_CHIP_ESP32C3WROOM02=y
 CONFIG_ARCH_INTERRUPTSTACK=1536
diff --git a/boards/risc-v/esp32c3/esp32c3-devkit/configs/efuse/defconfig b/boards/risc-v/esp32c3-legacy/esp32c3-devkit/configs/efuse/defconfig
similarity index 97%
rename from boards/risc-v/esp32c3/esp32c3-devkit/configs/efuse/defconfig
rename to boards/risc-v/esp32c3-legacy/esp32c3-devkit/configs/efuse/defconfig
index 60e16c95a3a..f95e761e410 100644
--- a/boards/risc-v/esp32c3/esp32c3-devkit/configs/efuse/defconfig
+++ b/boards/risc-v/esp32c3-legacy/esp32c3-devkit/configs/efuse/defconfig
@@ -14,7 +14,7 @@ CONFIG_ARCH="risc-v"
 CONFIG_ARCH_BOARD="esp32c3-devkit"
 CONFIG_ARCH_BOARD_COMMON=y
 CONFIG_ARCH_BOARD_ESP32C3_DEVKIT=y
-CONFIG_ARCH_CHIP="esp32c3"
+CONFIG_ARCH_CHIP="esp32c3-legacy"
 CONFIG_ARCH_CHIP_ESP32C3=y
 CONFIG_ARCH_CHIP_ESP32C3WROOM02=y
 CONFIG_ARCH_INTERRUPTSTACK=1536
diff --git a/boards/risc-v/esp32c3/esp32c3-devkit/configs/elf/defconfig b/boards/risc-v/esp32c3-legacy/esp32c3-devkit/configs/elf/defconfig
similarity index 97%
rename from boards/risc-v/esp32c3/esp32c3-devkit/configs/elf/defconfig
rename to boards/risc-v/esp32c3-legacy/esp32c3-devkit/configs/elf/defconfig
index 9db821d2353..733052ae6bd 100644
--- a/boards/risc-v/esp32c3/esp32c3-devkit/configs/elf/defconfig
+++ b/boards/risc-v/esp32c3-legacy/esp32c3-devkit/configs/elf/defconfig
@@ -10,7 +10,7 @@ CONFIG_ARCH="risc-v"
 CONFIG_ARCH_BOARD="esp32c3-devkit"
 CONFIG_ARCH_BOARD_COMMON=y
 CONFIG_ARCH_BOARD_ESP32C3_DEVKIT=y
-CONFIG_ARCH_CHIP="esp32c3"
+CONFIG_ARCH_CHIP="esp32c3-legacy"
 CONFIG_ARCH_CHIP_ESP32C3=y
 CONFIG_ARCH_CHIP_ESP32C3WROOM02=y
 CONFIG_ARCH_INTERRUPTSTACK=8192
diff --git a/boards/risc-v/esp32c3/esp32c3-devkit/configs/gdbstub/defconfig b/boards/risc-v/esp32c3-legacy/esp32c3-devkit/configs/gdbstub/defconfig
similarity index 98%
rename from boards/risc-v/esp32c3/esp32c3-devkit/configs/gdbstub/defconfig
rename to boards/risc-v/esp32c3-legacy/esp32c3-devkit/configs/gdbstub/defconfig
index 7e52b5600d7..62864d769a7 100644
--- a/boards/risc-v/esp32c3/esp32c3-devkit/configs/gdbstub/defconfig
+++ b/boards/risc-v/esp32c3-legacy/esp32c3-devkit/configs/gdbstub/defconfig
@@ -12,7 +12,7 @@ CONFIG_ARCH="risc-v"
 CONFIG_ARCH_BOARD="esp32c3-devkit"
 CONFIG_ARCH_BOARD_COMMON=y
 CONFIG_ARCH_BOARD_ESP32C3_DEVKIT=y
-CONFIG_ARCH_CHIP="esp32c3"
+CONFIG_ARCH_CHIP="esp32c3-legacy"
 CONFIG_ARCH_CHIP_ESP32C3=y
 CONFIG_ARCH_CHIP_ESP32C3WROOM02=y
 CONFIG_ARCH_FLOAT_H=y
diff --git a/boards/risc-v/esp32c3/esp32c3-devkit/configs/gpio/defconfig b/boards/risc-v/esp32c3-legacy/esp32c3-devkit/configs/gpio/defconfig
similarity index 97%
rename from boards/risc-v/esp32c3/esp32c3-devkit/configs/gpio/defconfig
rename to boards/risc-v/esp32c3-legacy/esp32c3-devkit/configs/gpio/defconfig
index 0e6d2136377..53b6d882a0a 100644
--- a/boards/risc-v/esp32c3/esp32c3-devkit/configs/gpio/defconfig
+++ b/boards/risc-v/esp32c3-legacy/esp32c3-devkit/configs/gpio/defconfig
@@ -11,7 +11,7 @@ CONFIG_ARCH="risc-v"
 CONFIG_ARCH_BOARD="esp32c3-devkit"
 CONFIG_ARCH_BOARD_COMMON=y
 CONFIG_ARCH_BOARD_ESP32C3_DEVKIT=y
-CONFIG_ARCH_CHIP="esp32c3"
+CONFIG_ARCH_CHIP="esp32c3-legacy"
 CONFIG_ARCH_CHIP_ESP32C3=y
 CONFIG_ARCH_CHIP_ESP32C3WROOM02=y
 CONFIG_ARCH_INTERRUPTSTACK=1536
diff --git a/boards/risc-v/esp32c3/esp32c3-devkit/configs/knsh/defconfig b/boards/risc-v/esp32c3-legacy/esp32c3-devkit/configs/knsh/defconfig
similarity index 93%
rename from boards/risc-v/esp32c3/esp32c3-devkit/configs/knsh/defconfig
rename to boards/risc-v/esp32c3-legacy/esp32c3-devkit/configs/knsh/defconfig
index a93bb3181db..e5d7ee023be 100644
--- a/boards/risc-v/esp32c3/esp32c3-devkit/configs/knsh/defconfig
+++ b/boards/risc-v/esp32c3-legacy/esp32c3-devkit/configs/knsh/defconfig
@@ -12,7 +12,7 @@ CONFIG_ARCH="risc-v"
 CONFIG_ARCH_BOARD="esp32c3-devkit"
 CONFIG_ARCH_BOARD_COMMON=y
 CONFIG_ARCH_BOARD_ESP32C3_DEVKIT=y
-CONFIG_ARCH_CHIP="esp32c3"
+CONFIG_ARCH_CHIP="esp32c3-legacy"
 CONFIG_ARCH_CHIP_ESP32C3=y
 CONFIG_ARCH_CHIP_ESP32C3WROOM02=y
 CONFIG_ARCH_INTERRUPTSTACK=2048
@@ -40,7 +40,7 @@ CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_READLINE=y
 CONFIG_NSH_STRERROR=y
 CONFIG_NUTTX_USERSPACE=0x3c080018
-CONFIG_PASS1_BUILDIR="boards/risc-v/esp32c3/common/kernel"
+CONFIG_PASS1_BUILDIR="boards/risc-v/esp32c3-legacy/common/kernel"
 CONFIG_PREALLOC_TIMERS=0
 CONFIG_RAW_BINARY=y
 CONFIG_RR_INTERVAL=200
diff --git a/boards/risc-v/esp32c3/esp32c3-devkit/configs/lvgl/defconfig b/boards/risc-v/esp32c3-legacy/esp32c3-devkit/configs/lvgl/defconfig
similarity index 98%
rename from boards/risc-v/esp32c3/esp32c3-devkit/configs/lvgl/defconfig
rename to boards/risc-v/esp32c3-legacy/esp32c3-devkit/configs/lvgl/defconfig
index ee85f87d5fa..1558978c75c 100644
--- a/boards/risc-v/esp32c3/esp32c3-devkit/configs/lvgl/defconfig
+++ b/boards/risc-v/esp32c3-legacy/esp32c3-devkit/configs/lvgl/defconfig
@@ -12,7 +12,7 @@ CONFIG_ARCH="risc-v"
 CONFIG_ARCH_BOARD="esp32c3-devkit"
 CONFIG_ARCH_BOARD_COMMON=y
 CONFIG_ARCH_BOARD_ESP32C3_DEVKIT=y
-CONFIG_ARCH_CHIP="esp32c3"
+CONFIG_ARCH_CHIP="esp32c3-legacy"
 CONFIG_ARCH_CHIP_ESP32C3=y
 CONFIG_ARCH_CHIP_ESP32C3WROOM02=y
 CONFIG_ARCH_INTERRUPTSTACK=1536
diff --git a/boards/risc-v/esp32c3/esp32c3-devkit/configs/mcuboot_slot_confirm/defconfig b/boards/risc-v/esp32c3-legacy/esp32c3-devkit/configs/mcuboot_slot_confirm/defconfig
similarity index 97%
rename from boards/risc-v/esp32c3/esp32c3-devkit/configs/mcuboot_slot_confirm/defconfig
rename to boards/risc-v/esp32c3-legacy/esp32c3-devkit/configs/mcuboot_slot_confirm/defconfig
index b95e1c0cb9b..416e0e057cb 100644
--- a/boards/risc-v/esp32c3/esp32c3-devkit/configs/mcuboot_slot_confirm/defconfig
+++ b/boards/risc-v/esp32c3-legacy/esp32c3-devkit/configs/mcuboot_slot_confirm/defconfig
@@ -11,7 +11,7 @@ CONFIG_ARCH="risc-v"
 CONFIG_ARCH_BOARD="esp32c3-devkit"
 CONFIG_ARCH_BOARD_COMMON=y
 CONFIG_ARCH_BOARD_ESP32C3_DEVKIT=y
-CONFIG_ARCH_CHIP="esp32c3"
+CONFIG_ARCH_CHIP="esp32c3-legacy"
 CONFIG_ARCH_CHIP_ESP32C3=y
 CONFIG_ARCH_CHIP_ESP32C3WROOM02=y
 CONFIG_ARCH_INTERRUPTSTACK=1536
diff --git a/boards/risc-v/esp32c3/esp32c3-devkit/configs/module/defconfig b/boards/risc-v/esp32c3-legacy/esp32c3-devkit/configs/module/defconfig
similarity index 97%
rename from boards/risc-v/esp32c3/esp32c3-devkit/configs/module/defconfig
rename to boards/risc-v/esp32c3-legacy/esp32c3-devkit/configs/module/defconfig
index 690203b5fa6..651617ffc90 100644
--- a/boards/risc-v/esp32c3/esp32c3-devkit/configs/module/defconfig
+++ b/boards/risc-v/esp32c3-legacy/esp32c3-devkit/configs/module/defconfig
@@ -11,7 +11,7 @@ CONFIG_ARCH="risc-v"
 CONFIG_ARCH_BOARD="esp32c3-devkit"
 CONFIG_ARCH_BOARD_COMMON=y
 CONFIG_ARCH_BOARD_ESP32C3_DEVKIT=y
-CONFIG_ARCH_CHIP="esp32c3"
+CONFIG_ARCH_CHIP="esp32c3-legacy"
 CONFIG_ARCH_CHIP_ESP32C3=y
 CONFIG_ARCH_CHIP_ESP32C3WROOM02=y
 CONFIG_ARCH_INTERRUPTSTACK=1536
diff --git a/boards/risc-v/esp32c3/esp32c3-devkit/configs/nsh/defconfig b/boards/risc-v/esp32c3-legacy/esp32c3-devkit/configs/nsh/defconfig
similarity index 97%
rename from boards/risc-v/esp32c3/esp32c3-devkit/configs/nsh/defconfig
rename to boards/risc-v/esp32c3-legacy/esp32c3-devkit/configs/nsh/defconfig
index f53c09c51d1..6611a77b6e4 100644
--- a/boards/risc-v/esp32c3/esp32c3-devkit/configs/nsh/defconfig
+++ b/boards/risc-v/esp32c3-legacy/esp32c3-devkit/configs/nsh/defconfig
@@ -11,7 +11,7 @@ CONFIG_ARCH="risc-v"
 CONFIG_ARCH_BOARD="esp32c3-devkit"
 CONFIG_ARCH_BOARD_COMMON=y
 CONFIG_ARCH_BOARD_ESP32C3_DEVKIT=y
-CONFIG_ARCH_CHIP="esp32c3"
+CONFIG_ARCH_CHIP="esp32c3-legacy"
 CONFIG_ARCH_CHIP_ESP32C3=y
 CONFIG_ARCH_CHIP_ESP32C3WROOM02=y
 CONFIG_ARCH_INTERRUPTSTACK=1536
diff --git a/boards/risc-v/esp32c3/esp32c3-devkit/configs/nvcfgdata/defconfig b/boards/risc-v/esp32c3-legacy/esp32c3-devkit/configs/nvcfgdata/defconfig
similarity index 97%
rename from boards/risc-v/esp32c3/esp32c3-devkit/configs/nvcfgdata/defconfig
rename to boards/risc-v/esp32c3-legacy/esp32c3-devkit/configs/nvcfgdata/defconfig
index aa2b4d5e30f..7cfaebed438 100644
--- a/boards/risc-v/esp32c3/esp32c3-devkit/configs/nvcfgdata/defconfig
+++ b/boards/risc-v/esp32c3-legacy/esp32c3-devkit/configs/nvcfgdata/defconfig
@@ -11,7 +11,7 @@ CONFIG_ARCH="risc-v"
 CONFIG_ARCH_BOARD="esp32c3-devkit"
 CONFIG_ARCH_BOARD_COMMON=y
 CONFIG_ARCH_BOARD_ESP32C3_DEVKIT=y
-CONFIG_ARCH_CHIP="esp32c3"
+CONFIG_ARCH_CHIP="esp32c3-legacy"
 CONFIG_ARCH_CHIP_ESP32C3=y
 CONFIG_ARCH_CHIP_ESP32C3WROOM02=y
 CONFIG_ARCH_INTERRUPTSTACK=1536
diff --git a/boards/risc-v/esp32c3/esp32c3-devkit/configs/oneshot/defconfig b/boards/risc-v/esp32c3-legacy/esp32c3-devkit/configs/oneshot/defconfig
similarity index 97%
rename from boards/risc-v/esp32c3/esp32c3-devkit/configs/oneshot/defconfig
rename to boards/risc-v/esp32c3-legacy/esp32c3-devkit/configs/oneshot/defconfig
index 103406f56c8..e81879c2a52 100644
--- a/boards/risc-v/esp32c3/esp32c3-devkit/configs/oneshot/defconfig
+++ b/boards/risc-v/esp32c3-legacy/esp32c3-devkit/configs/oneshot/defconfig
@@ -11,7 +11,7 @@ CONFIG_ARCH="risc-v"
 CONFIG_ARCH_BOARD="esp32c3-devkit"
 CONFIG_ARCH_BOARD_COMMON=y
 CONFIG_ARCH_BOARD_ESP32C3_DEVKIT=y
-CONFIG_ARCH_CHIP="esp32c3"
+CONFIG_ARCH_CHIP="esp32c3-legacy"
 CONFIG_ARCH_CHIP_ESP32C3=y
 CONFIG_ARCH_CHIP_ESP32C3WROOM02=y
 CONFIG_ARCH_INTERRUPTSTACK=1536
diff --git a/boards/risc-v/esp32c3/esp32c3-devkit/configs/ostest/defconfig b/boards/risc-v/esp32c3-legacy/esp32c3-devkit/configs/ostest/defconfig
similarity index 97%
rename from boards/risc-v/esp32c3/esp32c3-devkit/configs/ostest/defconfig
rename to boards/risc-v/esp32c3-legacy/esp32c3-devkit/configs/ostest/defconfig
index 7abccd7294a..67813aabfaa 100644
--- a/boards/risc-v/esp32c3/esp32c3-devkit/configs/ostest/defconfig
+++ b/boards/risc-v/esp32c3-legacy/esp32c3-devkit/configs/ostest/defconfig
@@ -11,7 +11,7 @@ CONFIG_ARCH="risc-v"
 CONFIG_ARCH_BOARD="esp32c3-devkit"
 CONFIG_ARCH_BOARD_COMMON=y
 CONFIG_ARCH_BOARD_ESP32C3_DEVKIT=y
-CONFIG_ARCH_CHIP="esp32c3"
+CONFIG_ARCH_CHIP="esp32c3-legacy"
 CONFIG_ARCH_CHIP_ESP32C3=y
 CONFIG_ARCH_CHIP_ESP32C3WROOM02=y
 CONFIG_ARCH_INTERRUPTSTACK=1536
diff --git a/boards/risc-v/esp32c3/esp32c3-devkit/configs/pm/defconfig b/boards/risc-v/esp32c3-legacy/esp32c3-devkit/configs/pm/defconfig
similarity index 97%
rename from boards/risc-v/esp32c3/esp32c3-devkit/configs/pm/defconfig
rename to boards/risc-v/esp32c3-legacy/esp32c3-devkit/configs/pm/defconfig
index 607589c253b..b649c3927af 100644
--- a/boards/risc-v/esp32c3/esp32c3-devkit/configs/pm/defconfig
+++ b/boards/risc-v/esp32c3-legacy/esp32c3-devkit/configs/pm/defconfig
@@ -11,7 +11,7 @@ CONFIG_ARCH="risc-v"
 CONFIG_ARCH_BOARD="esp32c3-devkit"
 CONFIG_ARCH_BOARD_COMMON=y
 CONFIG_ARCH_BOARD_ESP32C3_DEVKIT=y
-CONFIG_ARCH_CHIP="esp32c3"
+CONFIG_ARCH_CHIP="esp32c3-legacy"
 CONFIG_ARCH_CHIP_ESP32C3=y
 CONFIG_ARCH_CHIP_ESP32C3WROOM02=y
 CONFIG_ARCH_INTERRUPTSTACK=1536
diff --git a/boards/risc-v/esp32c3/esp32c3-devkit/configs/pwm/defconfig b/boards/risc-v/esp32c3-legacy/esp32c3-devkit/configs/pwm/defconfig
similarity index 97%
rename from boards/risc-v/esp32c3/esp32c3-devkit/configs/pwm/defconfig
rename to boards/risc-v/esp32c3-legacy/esp32c3-devkit/configs/pwm/defconfig
index 105dbe3eff8..021c6072252 100644
--- a/boards/risc-v/esp32c3/esp32c3-devkit/configs/pwm/defconfig
+++ b/boards/risc-v/esp32c3-legacy/esp32c3-devkit/configs/pwm/defconfig
@@ -11,7 +11,7 @@ CONFIG_ARCH="risc-v"
 CONFIG_ARCH_BOARD="esp32c3-devkit"
 CONFIG_ARCH_BOARD_COMMON=y
 CONFIG_ARCH_BOARD_ESP32C3_DEVKIT=y
-CONFIG_ARCH_CHIP="esp32c3"
+CONFIG_ARCH_CHIP="esp32c3-legacy"
 CONFIG_ARCH_CHIP_ESP32C3=y
 CONFIG_ARCH_CHIP_ESP32C3WROOM02=y
 CONFIG_ARCH_INTERRUPTSTACK=1536
diff --git a/boards/risc-v/esp32c3/esp32c3-devkit/configs/random/defconfig b/boards/risc-v/esp32c3-legacy/esp32c3-devkit/configs/random/defconfig
similarity index 97%
rename from boards/risc-v/esp32c3/esp32c3-devkit/configs/random/defconfig
rename to boards/risc-v/esp32c3-legacy/esp32c3-devkit/configs/random/defconfig
index 9cbdb91bfd7..82a57e2dbb0 100644
--- a/boards/risc-v/esp32c3/esp32c3-devkit/configs/random/defconfig
+++ b/boards/risc-v/esp32c3-legacy/esp32c3-devkit/configs/random/defconfig
@@ -11,7 +11,7 @@ CONFIG_ARCH="risc-v"
 CONFIG_ARCH_BOARD="esp32c3-devkit"
 CONFIG_ARCH_BOARD_COMMON=y
 CONFIG_ARCH_BOARD_ESP32C3_DEVKIT=y
-CONFIG_ARCH_CHIP="esp32c3"
+CONFIG_ARCH_CHIP="esp32c3-legacy"
 CONFIG_ARCH_CHIP_ESP32C3=y
 CONFIG_ARCH_CHIP_ESP32C3WROOM02=y
 CONFIG_ARCH_INTERRUPTSTACK=1536
diff --git a/boards/risc-v/esp32c3/esp32c3-devkit/configs/romfs/defconfig b/boards/risc-v/esp32c3-legacy/esp32c3-devkit/configs/romfs/defconfig
similarity index 97%
rename from boards/risc-v/esp32c3/esp32c3-devkit/configs/romfs/defconfig
rename to boards/risc-v/esp32c3-legacy/esp32c3-devkit/configs/romfs/defconfig
index 2698129e36c..d07378991f6 100644
--- a/boards/risc-v/esp32c3/esp32c3-devkit/configs/romfs/defconfig
+++ b/boards/risc-v/esp32c3-legacy/esp32c3-devkit/configs/romfs/defconfig
@@ -11,7 +11,7 @@ CONFIG_ARCH="risc-v"
 CONFIG_ARCH_BOARD="esp32c3-devkit"
 CONFIG_ARCH_BOARD_COMMON=y
 CONFIG_ARCH_BOARD_ESP32C3_DEVKIT=y
-CONFIG_ARCH_CHIP="esp32c3"
+CONFIG_ARCH_CHIP="esp32c3-legacy"
 CONFIG_ARCH_CHIP_ESP32C3=y
 CONFIG_ARCH_CHIP_ESP32C3WROOM02=y
 CONFIG_ARCH_INTERRUPTSTACK=1536
diff --git a/boards/risc-v/esp32c3/esp32c3-devkit/configs/rtc/defconfig b/boards/risc-v/esp32c3-legacy/esp32c3-devkit/configs/rtc/defconfig
similarity index 97%
rename from boards/risc-v/esp32c3/esp32c3-devkit/configs/rtc/defconfig
rename to boards/risc-v/esp32c3-legacy/esp32c3-devkit/configs/rtc/defconfig
index 3fb307d0874..2cade852884 100644
--- a/boards/risc-v/esp32c3/esp32c3-devkit/configs/rtc/defconfig
+++ b/boards/risc-v/esp32c3-legacy/esp32c3-devkit/configs/rtc/defconfig
@@ -11,7 +11,7 @@ CONFIG_ARCH="risc-v"
 CONFIG_ARCH_BOARD="esp32c3-devkit"
 CONFIG_ARCH_BOARD_COMMON=y
 CONFIG_ARCH_BOARD_ESP32C3_DEVKIT=y
-CONFIG_ARCH_CHIP="esp32c3"
+CONFIG_ARCH_CHIP="esp32c3-legacy"
 CONFIG_ARCH_CHIP_ESP32C3=y
 CONFIG_ARCH_CHIP_ESP32C3WROOM02=y
 CONFIG_ARCH_INTERRUPTSTACK=1536
diff --git a/boards/risc-v/esp32c3/esp32c3-devkit/configs/sotest/defconfig b/boards/risc-v/esp32c3-legacy/esp32c3-devkit/configs/sotest/defconfig
similarity index 97%
rename from boards/risc-v/esp32c3/esp32c3-devkit/configs/sotest/defconfig
rename to boards/risc-v/esp32c3-legacy/esp32c3-devkit/configs/sotest/defconfig
index f0aa1d19349..14610526639 100644
--- a/boards/risc-v/esp32c3/esp32c3-devkit/configs/sotest/defconfig
+++ b/boards/risc-v/esp32c3-legacy/esp32c3-devkit/configs/sotest/defconfig
@@ -11,7 +11,7 @@ CONFIG_ARCH="risc-v"
 CONFIG_ARCH_BOARD="esp32c3-devkit"
 CONFIG_ARCH_BOARD_COMMON=y
 CONFIG_ARCH_BOARD_ESP32C3_DEVKIT=y
-CONFIG_ARCH_CHIP="esp32c3"
+CONFIG_ARCH_CHIP="esp32c3-legacy"
 CONFIG_ARCH_CHIP_ESP32C3=y
 CONFIG_ARCH_CHIP_ESP32C3WROOM02=y
 CONFIG_ARCH_INTERRUPTSTACK=1536
diff --git a/boards/risc-v/esp32c3/esp32c3-devkit/configs/spiflash/defconfig b/boards/risc-v/esp32c3-legacy/esp32c3-devkit/configs/spiflash/defconfig
similarity index 97%
rename from boards/risc-v/esp32c3/esp32c3-devkit/configs/spiflash/defconfig
rename to boards/risc-v/esp32c3-legacy/esp32c3-devkit/configs/spiflash/defconfig
index 41d643e3435..8c41d1de705 100644
--- a/boards/risc-v/esp32c3/esp32c3-devkit/configs/spiflash/defconfig
+++ b/boards/risc-v/esp32c3-legacy/esp32c3-devkit/configs/spiflash/defconfig
@@ -11,7 +11,7 @@ CONFIG_ARCH="risc-v"
 CONFIG_ARCH_BOARD="esp32c3-devkit"
 CONFIG_ARCH_BOARD_COMMON=y
 CONFIG_ARCH_BOARD_ESP32C3_DEVKIT=y
-CONFIG_ARCH_CHIP="esp32c3"
+CONFIG_ARCH_CHIP="esp32c3-legacy"
 CONFIG_ARCH_CHIP_ESP32C3=y
 CONFIG_ARCH_CHIP_ESP32C3WROOM02=y
 CONFIG_ARCH_INTERRUPTSTACK=1536
diff --git a/boards/risc-v/esp32c3/esp32c3-devkit/configs/sta_softap/defconfig b/boards/risc-v/esp32c3-legacy/esp32c3-devkit/configs/sta_softap/defconfig
similarity index 98%
rename from boards/risc-v/esp32c3/esp32c3-devkit/configs/sta_softap/defconfig
rename to boards/risc-v/esp32c3-legacy/esp32c3-devkit/configs/sta_softap/defconfig
index ca2aa6bfae3..1e543387989 100644
--- a/boards/risc-v/esp32c3/esp32c3-devkit/configs/sta_softap/defconfig
+++ b/boards/risc-v/esp32c3-legacy/esp32c3-devkit/configs/sta_softap/defconfig
@@ -12,7 +12,7 @@ CONFIG_ARCH="risc-v"
 CONFIG_ARCH_BOARD="esp32c3-devkit"
 CONFIG_ARCH_BOARD_COMMON=y
 CONFIG_ARCH_BOARD_ESP32C3_DEVKIT=y
-CONFIG_ARCH_CHIP="esp32c3"
+CONFIG_ARCH_CHIP="esp32c3-legacy"
 CONFIG_ARCH_CHIP_ESP32C3=y
 CONFIG_ARCH_CHIP_ESP32C3WROOM02=y
 CONFIG_ARCH_INTERRUPTSTACK=1536
diff --git a/boards/risc-v/esp32c3/esp32c3-devkit/configs/tickless/defconfig b/boards/risc-v/esp32c3-legacy/esp32c3-devkit/configs/tickless/defconfig
similarity index 97%
rename from boards/risc-v/esp32c3/esp32c3-devkit/configs/tickless/defconfig
rename to boards/risc-v/esp32c3-legacy/esp32c3-devkit/configs/tickless/defconfig
index 8a5fa7baa47..8f94776fcf5 100644
--- a/boards/risc-v/esp32c3/esp32c3-devkit/configs/tickless/defconfig
+++ b/boards/risc-v/esp32c3-legacy/esp32c3-devkit/configs/tickless/defconfig
@@ -11,7 +11,7 @@ CONFIG_ARCH="risc-v"
 CONFIG_ARCH_BOARD="esp32c3-devkit"
 CONFIG_ARCH_BOARD_COMMON=y
 CONFIG_ARCH_BOARD_ESP32C3_DEVKIT=y
-CONFIG_ARCH_CHIP="esp32c3"
+CONFIG_ARCH_CHIP="esp32c3-legacy"
 CONFIG_ARCH_CHIP_ESP32C3=y
 CONFIG_ARCH_CHIP_ESP32C3WROOM02=y
 CONFIG_ARCH_INTERRUPTSTACK=1536
diff --git a/boards/risc-v/esp32c3/esp32c3-devkit/configs/timer/defconfig b/boards/risc-v/esp32c3-legacy/esp32c3-devkit/configs/timer/defconfig
similarity index 97%
rename from boards/risc-v/esp32c3/esp32c3-devkit/configs/timer/defconfig
rename to boards/risc-v/esp32c3-legacy/esp32c3-devkit/configs/timer/defconfig
index 0458cc53418..473cc3a53bd 100644
--- a/boards/risc-v/esp32c3/esp32c3-devkit/configs/timer/defconfig
+++ b/boards/risc-v/esp32c3-legacy/esp32c3-devkit/configs/timer/defconfig
@@ -11,7 +11,7 @@ CONFIG_ARCH="risc-v"
 CONFIG_ARCH_BOARD="esp32c3-devkit"
 CONFIG_ARCH_BOARD_COMMON=y
 CONFIG_ARCH_BOARD_ESP32C3_DEVKIT=y
-CONFIG_ARCH_CHIP="esp32c3"
+CONFIG_ARCH_CHIP="esp32c3-legacy"
 CONFIG_ARCH_CHIP_ESP32C3=y
 CONFIG_ARCH_CHIP_ESP32C3WROOM02=y
 CONFIG_ARCH_INTERRUPTSTACK=1536
diff --git a/boards/risc-v/esp32c3/esp32c3-devkit/configs/twai/defconfig b/boards/risc-v/esp32c3-legacy/esp32c3-devkit/configs/twai/defconfig
similarity index 97%
rename from boards/risc-v/esp32c3/esp32c3-devkit/configs/twai/defconfig
rename to boards/risc-v/esp32c3-legacy/esp32c3-devkit/configs/twai/defconfig
index 0424471db0c..b78d5653da1 100644
--- a/boards/risc-v/esp32c3/esp32c3-devkit/configs/twai/defconfig
+++ b/boards/risc-v/esp32c3-legacy/esp32c3-devkit/configs/twai/defconfig
@@ -11,7 +11,7 @@ CONFIG_ARCH="risc-v"
 CONFIG_ARCH_BOARD="esp32c3-devkit"
 CONFIG_ARCH_BOARD_COMMON=y
 CONFIG_ARCH_BOARD_ESP32C3_DEVKIT=y
-CONFIG_ARCH_CHIP="esp32c3"
+CONFIG_ARCH_CHIP="esp32c3-legacy"
 CONFIG_ARCH_CHIP_ESP32C3=y
 CONFIG_ARCH_CHIP_ESP32C3MINI1=y
 CONFIG_ARCH_INTERRUPTSTACK=1536
diff --git a/boards/risc-v/esp32c3/esp32c3-devkit/configs/uid/defconfig b/boards/risc-v/esp32c3-legacy/esp32c3-devkit/configs/uid/defconfig
similarity index 97%
rename from boards/risc-v/esp32c3/esp32c3-devkit/configs/uid/defconfig
rename to boards/risc-v/esp32c3-legacy/esp32c3-devkit/configs/uid/defconfig
index c0823183ace..4ec4c11b387 100644
--- a/boards/risc-v/esp32c3/esp32c3-devkit/configs/uid/defconfig
+++ b/boards/risc-v/esp32c3-legacy/esp32c3-devkit/configs/uid/defconfig
@@ -11,7 +11,7 @@ CONFIG_ARCH="risc-v"
 CONFIG_ARCH_BOARD="esp32c3-devkit"
 CONFIG_ARCH_BOARD_COMMON=y
 CONFIG_ARCH_BOARD_ESP32C3_DEVKIT=y
-CONFIG_ARCH_CHIP="esp32c3"
+CONFIG_ARCH_CHIP="esp32c3-legacy"
 CONFIG_ARCH_CHIP_ESP32C3=y
 CONFIG_ARCH_CHIP_ESP32C3WROOM02=y
 CONFIG_ARCH_INTERRUPTSTACK=1536
diff --git a/boards/risc-v/esp32c3/esp32c3-devkit/configs/usbconsole/defconfig b/boards/risc-v/esp32c3-legacy/esp32c3-devkit/configs/usbconsole/defconfig
similarity index 97%
rename from boards/risc-v/esp32c3/esp32c3-devkit/configs/usbconsole/defconfig
rename to boards/risc-v/esp32c3-legacy/esp32c3-devkit/configs/usbconsole/defconfig
index d60597df452..b18f3764c07 100644
--- a/boards/risc-v/esp32c3/esp32c3-devkit/configs/usbconsole/defconfig
+++ b/boards/risc-v/esp32c3-legacy/esp32c3-devkit/configs/usbconsole/defconfig
@@ -12,7 +12,7 @@ CONFIG_ARCH="risc-v"
 CONFIG_ARCH_BOARD="esp32c3-devkit"
 CONFIG_ARCH_BOARD_COMMON=y
 CONFIG_ARCH_BOARD_ESP32C3_DEVKIT=y
-CONFIG_ARCH_CHIP="esp32c3"
+CONFIG_ARCH_CHIP="esp32c3-legacy"
 CONFIG_ARCH_CHIP_ESP32C3=y
 CONFIG_ARCH_CHIP_ESP32C3WROOM02=y
 CONFIG_ARCH_INTERRUPTSTACK=1536
diff --git a/boards/risc-v/esp32c3/esp32c3-devkit/configs/watchdog/defconfig b/boards/risc-v/esp32c3-legacy/esp32c3-devkit/configs/watchdog/defconfig
similarity index 97%
rename from boards/risc-v/esp32c3/esp32c3-devkit/configs/watchdog/defconfig
rename to boards/risc-v/esp32c3-legacy/esp32c3-devkit/configs/watchdog/defconfig
index 45cc9903210..fd24d97b143 100644
--- a/boards/risc-v/esp32c3/esp32c3-devkit/configs/watchdog/defconfig
+++ b/boards/risc-v/esp32c3-legacy/esp32c3-devkit/configs/watchdog/defconfig
@@ -11,7 +11,7 @@ CONFIG_ARCH="risc-v"
 CONFIG_ARCH_BOARD="esp32c3-devkit"
 CONFIG_ARCH_BOARD_COMMON=y
 CONFIG_ARCH_BOARD_ESP32C3_DEVKIT=y
-CONFIG_ARCH_CHIP="esp32c3"
+CONFIG_ARCH_CHIP="esp32c3-legacy"
 CONFIG_ARCH_CHIP_ESP32C3=y
 CONFIG_ARCH_CHIP_ESP32C3WROOM02=y
 CONFIG_ARCH_INTERRUPTSTACK=1536
diff --git a/boards/risc-v/esp32c3/esp32c3-devkit/configs/watcher/defconfig b/boards/risc-v/esp32c3-legacy/esp32c3-devkit/configs/watcher/defconfig
similarity index 97%
rename from boards/risc-v/esp32c3/esp32c3-devkit/configs/watcher/defconfig
rename to boards/risc-v/esp32c3-legacy/esp32c3-devkit/configs/watcher/defconfig
index fbdaf4366a0..16bbdf473b2 100644
--- a/boards/risc-v/esp32c3/esp32c3-devkit/configs/watcher/defconfig
+++ b/boards/risc-v/esp32c3-legacy/esp32c3-devkit/configs/watcher/defconfig
@@ -11,7 +11,7 @@ CONFIG_ARCH="risc-v"
 CONFIG_ARCH_BOARD="esp32c3-devkit"
 CONFIG_ARCH_BOARD_COMMON=y
 CONFIG_ARCH_BOARD_ESP32C3_DEVKIT=y
-CONFIG_ARCH_CHIP="esp32c3"
+CONFIG_ARCH_CHIP="esp32c3-legacy"
 CONFIG_ARCH_CHIP_ESP32C3=y
 CONFIG_ARCH_CHIP_ESP32C3WROOM02=y
 CONFIG_ARCH_INTERRUPTSTACK=1536
diff --git a/boards/risc-v/esp32c3/esp32c3-devkit/configs/wifi/defconfig b/boards/risc-v/esp32c3-legacy/esp32c3-devkit/configs/wifi/defconfig
similarity index 98%
rename from boards/risc-v/esp32c3/esp32c3-devkit/configs/wifi/defconfig
rename to boards/risc-v/esp32c3-legacy/esp32c3-devkit/configs/wifi/defconfig
index 5446fed3e9b..0e9578798de 100644
--- a/boards/risc-v/esp32c3/esp32c3-devkit/configs/wifi/defconfig
+++ b/boards/risc-v/esp32c3-legacy/esp32c3-devkit/configs/wifi/defconfig
@@ -12,7 +12,7 @@ CONFIG_ARCH="risc-v"
 CONFIG_ARCH_BOARD="esp32c3-devkit"
 CONFIG_ARCH_BOARD_COMMON=y
 CONFIG_ARCH_BOARD_ESP32C3_DEVKIT=y
-CONFIG_ARCH_CHIP="esp32c3"
+CONFIG_ARCH_CHIP="esp32c3-legacy"
 CONFIG_ARCH_CHIP_ESP32C3=y
 CONFIG_ARCH_CHIP_ESP32C3WROOM02=y
 CONFIG_ARCH_INTERRUPTSTACK=1536
diff --git a/boards/risc-v/esp32c3/esp32c3-devkit/include/board.h b/boards/risc-v/esp32c3-legacy/esp32c3-devkit/include/board.h
similarity index 96%
rename from boards/risc-v/esp32c3/esp32c3-devkit/include/board.h
rename to boards/risc-v/esp32c3-legacy/esp32c3-devkit/include/board.h
index 07d6e4c5f9b..6b6552b4553 100644
--- a/boards/risc-v/esp32c3/esp32c3-devkit/include/board.h
+++ b/boards/risc-v/esp32c3-legacy/esp32c3-devkit/include/board.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * boards/risc-v/esp32c3/esp32c3-devkit/include/board.h
+ * boards/risc-v/esp32c3-legacy/esp32c3-devkit/include/board.h
  *
  * 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/esp32c3/esp32c3-devkit/include/board_memorymap.h b/boards/risc-v/esp32c3-legacy/esp32c3-devkit/include/board_memorymap.h
similarity index 98%
rename from boards/risc-v/esp32c3/esp32c3-devkit/include/board_memorymap.h
rename to boards/risc-v/esp32c3-legacy/esp32c3-devkit/include/board_memorymap.h
index 0010a78d005..ae6f7d97de4 100644
--- a/boards/risc-v/esp32c3/esp32c3-devkit/include/board_memorymap.h
+++ b/boards/risc-v/esp32c3-legacy/esp32c3-devkit/include/board_memorymap.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * boards/risc-v/esp32c3/esp32c3-devkit/include/board_memorymap.h
+ * boards/risc-v/esp32c3-legacy/esp32c3-devkit/include/board_memorymap.h
  *
  * 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/esp32c3/esp32c3-devkit/scripts/Make.defs b/boards/risc-v/esp32c3-legacy/esp32c3-devkit/scripts/Make.defs
similarity index 97%
rename from boards/risc-v/esp32c3/esp32c3-devkit/scripts/Make.defs
rename to boards/risc-v/esp32c3-legacy/esp32c3-devkit/scripts/Make.defs
index 4a8969ecff9..790e20407ca 100644
--- a/boards/risc-v/esp32c3/esp32c3-devkit/scripts/Make.defs
+++ b/boards/risc-v/esp32c3-legacy/esp32c3-devkit/scripts/Make.defs
@@ -1,5 +1,5 @@
 ############################################################################
-# boards/risc-v/esp32c3/esp32c3-devkit/scripts/Make.defs
+# boards/risc-v/esp32c3-legacy/esp32c3-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/esp32c3/esp32c3-devkit/src/Make.defs b/boards/risc-v/esp32c3-legacy/esp32c3-devkit/src/Make.defs
similarity index 96%
rename from boards/risc-v/esp32c3/esp32c3-devkit/src/Make.defs
rename to boards/risc-v/esp32c3-legacy/esp32c3-devkit/src/Make.defs
index 391e701e6f2..854d2652f3d 100644
--- a/boards/risc-v/esp32c3/esp32c3-devkit/src/Make.defs
+++ b/boards/risc-v/esp32c3-legacy/esp32c3-devkit/src/Make.defs
@@ -1,5 +1,5 @@
 #############################################################################
-# boards/risc-v/esp32c3/esp32c3-devkit/src/Makefile
+# boards/risc-v/esp32c3-legacy/esp32c3-devkit/src/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/esp32c3/esp32c3-devkit/src/esp32c3-devkit.h b/boards/risc-v/esp32c3-legacy/esp32c3-devkit/src/esp32c3-devkit.h
similarity index 97%
rename from boards/risc-v/esp32c3/esp32c3-devkit/src/esp32c3-devkit.h
rename to boards/risc-v/esp32c3-legacy/esp32c3-devkit/src/esp32c3-devkit.h
index 860c090d66a..56a7a08efe6 100644
--- a/boards/risc-v/esp32c3/esp32c3-devkit/src/esp32c3-devkit.h
+++ b/boards/risc-v/esp32c3-legacy/esp32c3-devkit/src/esp32c3-devkit.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * boards/risc-v/esp32c3/esp32c3-devkit/src/esp32c3-devkit.h
+ * boards/risc-v/esp32c3-legacy/esp32c3-devkit/src/esp32c3-devkit.h
  *
  * 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/esp32c3/esp32c3-devkit/src/esp32c3_appinit.c b/boards/risc-v/esp32c3-legacy/esp32c3-devkit/src/esp32c3_appinit.c
similarity index 97%
rename from boards/risc-v/esp32c3/esp32c3-devkit/src/esp32c3_appinit.c
rename to boards/risc-v/esp32c3-legacy/esp32c3-devkit/src/esp32c3_appinit.c
index 4f683dc85c8..22d57f459b4 100644
--- a/boards/risc-v/esp32c3/esp32c3-devkit/src/esp32c3_appinit.c
+++ b/boards/risc-v/esp32c3-legacy/esp32c3-devkit/src/esp32c3_appinit.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * boards/risc-v/esp32c3/esp32c3-devkit/src/esp32c3_appinit.c
+ * boards/risc-v/esp32c3-legacy/esp32c3-devkit/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/esp32c3/esp32c3-devkit/src/esp32c3_boot.c b/boards/risc-v/esp32c3-legacy/esp32c3-devkit/src/esp32c3_boot.c
similarity index 97%
rename from boards/risc-v/esp32c3/esp32c3-devkit/src/esp32c3_boot.c
rename to boards/risc-v/esp32c3-legacy/esp32c3-devkit/src/esp32c3_boot.c
index 934a05b72ec..ccf2a843978 100644
--- a/boards/risc-v/esp32c3/esp32c3-devkit/src/esp32c3_boot.c
+++ b/boards/risc-v/esp32c3-legacy/esp32c3-devkit/src/esp32c3_boot.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * boards/risc-v/esp32c3/esp32c3-devkit/src/esp32c3_boot.c
+ * boards/risc-v/esp32c3-legacy/esp32c3-devkit/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/esp32c3/esp32c3-devkit/src/esp32c3_bringup.c b/boards/risc-v/esp32c3-legacy/esp32c3-devkit/src/esp32c3_bringup.c
similarity index 99%
rename from boards/risc-v/esp32c3/esp32c3-devkit/src/esp32c3_bringup.c
rename to boards/risc-v/esp32c3-legacy/esp32c3-devkit/src/esp32c3_bringup.c
index dbb5708cf2b..7fb9e542b9d 100644
--- a/boards/risc-v/esp32c3/esp32c3-devkit/src/esp32c3_bringup.c
+++ b/boards/risc-v/esp32c3-legacy/esp32c3-devkit/src/esp32c3_bringup.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * boards/risc-v/esp32c3/esp32c3-devkit/src/esp32c3_bringup.c
+ * boards/risc-v/esp32c3-legacy/esp32c3-devkit/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/esp32c3/esp32c3-devkit/src/esp32c3_gpio.c b/boards/risc-v/esp32c3-legacy/esp32c3-devkit/src/esp32c3_gpio.c
similarity index 99%
rename from boards/risc-v/esp32c3/esp32c3-devkit/src/esp32c3_gpio.c
rename to boards/risc-v/esp32c3-legacy/esp32c3-devkit/src/esp32c3_gpio.c
index 4152f848ba4..ac424a419db 100644
--- a/boards/risc-v/esp32c3/esp32c3-devkit/src/esp32c3_gpio.c
+++ b/boards/risc-v/esp32c3-legacy/esp32c3-devkit/src/esp32c3_gpio.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * boards/risc-v/esp32c3/esp32c3-devkit/src/esp32c3_gpio.c
+ * boards/risc-v/esp32c3-legacy/esp32c3-devkit/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/esp32c3/esp32c3-devkit-rust-1/src/esp32c3_ioctl.c b/boards/risc-v/esp32c3-legacy/esp32c3-devkit/src/esp32c3_ioctl.c
similarity index 97%
rename from boards/risc-v/esp32c3/esp32c3-devkit-rust-1/src/esp32c3_ioctl.c
rename to boards/risc-v/esp32c3-legacy/esp32c3-devkit/src/esp32c3_ioctl.c
index 49ff906c2f2..5cec969b1b4 100644
--- a/boards/risc-v/esp32c3/esp32c3-devkit-rust-1/src/esp32c3_ioctl.c
+++ b/boards/risc-v/esp32c3-legacy/esp32c3-devkit/src/esp32c3_ioctl.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * boards/risc-v/esp32c3/esp32c3-devkit-rust-1/src/esp32c3_ioctl.c
+ * boards/risc-v/esp32c3-legacy/esp32c3-devkit/src/esp32c3_ioctl.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/esp32c3/esp32c3-devkit-rust-1/src/esp32c3_reset.c b/boards/risc-v/esp32c3-legacy/esp32c3-devkit/src/esp32c3_reset.c
similarity index 97%
rename from boards/risc-v/esp32c3/esp32c3-devkit-rust-1/src/esp32c3_reset.c
rename to boards/risc-v/esp32c3-legacy/esp32c3-devkit/src/esp32c3_reset.c
index cf9d29d1e1c..d3fc9344e6b 100644
--- a/boards/risc-v/esp32c3/esp32c3-devkit-rust-1/src/esp32c3_reset.c
+++ b/boards/risc-v/esp32c3-legacy/esp32c3-devkit/src/esp32c3_reset.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * boards/risc-v/esp32c3/esp32c3-devkit-rust-1/src/esp32c3_reset.c
+ * boards/risc-v/esp32c3-legacy/esp32c3-devkit/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/esp32c3/esp32c3-devkit/src/esp32c3_uid.c b/boards/risc-v/esp32c3-legacy/esp32c3-devkit/src/esp32c3_uid.c
similarity index 96%
rename from boards/risc-v/esp32c3/esp32c3-devkit/src/esp32c3_uid.c
rename to boards/risc-v/esp32c3-legacy/esp32c3-devkit/src/esp32c3_uid.c
index f01bed46c01..d1a8fb5b254 100644
--- a/boards/risc-v/esp32c3/esp32c3-devkit/src/esp32c3_uid.c
+++ b/boards/risc-v/esp32c3-legacy/esp32c3-devkit/src/esp32c3_uid.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * boards/risc-v/esp32c3/esp32c3-devkit/src/esp32c3_uid.c
+ * boards/risc-v/esp32c3-legacy/esp32c3-devkit/src/esp32c3_uid.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/esp32c3/esp32c3-devkit/src/etc/group b/boards/risc-v/esp32c3-legacy/esp32c3-devkit/src/etc/group
similarity index 100%
rename from boards/risc-v/esp32c3/esp32c3-devkit/src/etc/group
rename to boards/risc-v/esp32c3-legacy/esp32c3-devkit/src/etc/group
diff --git a/boards/risc-v/esp32c3/esp32c3-devkit/src/etc/init.d/rc.sysinit b/boards/risc-v/esp32c3-legacy/esp32c3-devkit/src/etc/init.d/rc.sysinit
similarity index 95%
rename from boards/risc-v/esp32c3/esp32c3-devkit/src/etc/init.d/rc.sysinit
rename to boards/risc-v/esp32c3-legacy/esp32c3-devkit/src/etc/init.d/rc.sysinit
index 53e4c5953a6..d7832773304 100644
--- a/boards/risc-v/esp32c3/esp32c3-devkit/src/etc/init.d/rc.sysinit
+++ b/boards/risc-v/esp32c3-legacy/esp32c3-devkit/src/etc/init.d/rc.sysinit
@@ -1,5 +1,5 @@
 /****************************************************************************
- * boards/risc-v/esp32c3/esp32c3-devkit/src/etc/init.d/rc.sysinit
+ * boards/risc-v/esp32c3-legacy/esp32c3-devkit/src/etc/init.d/rc.sysinit
  *
  * 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/esp32c3/esp32c3-devkit/src/etc/init.d/rcS b/boards/risc-v/esp32c3-legacy/esp32c3-devkit/src/etc/init.d/rcS
similarity index 93%
rename from boards/risc-v/esp32c3/esp32c3-devkit/src/etc/init.d/rcS
rename to boards/risc-v/esp32c3-legacy/esp32c3-devkit/src/etc/init.d/rcS
index 516a7cf649d..504982dfcfe 100644
--- a/boards/risc-v/esp32c3/esp32c3-devkit/src/etc/init.d/rcS
+++ b/boards/risc-v/esp32c3-legacy/esp32c3-devkit/src/etc/init.d/rcS
@@ -1,5 +1,5 @@
 /****************************************************************************
- * boards/risc-v/esp32c3/esp32c3-devkit/src/etc/init.d/rcS
+ * boards/risc-v/esp32c3-legacy/esp32c3-devkit/src/etc/init.d/rcS
  *
  * 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/esp32c3/esp32c3-devkit/src/etc/passwd b/boards/risc-v/esp32c3-legacy/esp32c3-devkit/src/etc/passwd
similarity index 100%
rename from boards/risc-v/esp32c3/esp32c3-devkit/src/etc/passwd
rename to boards/risc-v/esp32c3-legacy/esp32c3-devkit/src/etc/passwd