[bsp][esp32]: reorganize ESP32C3 BSP layout

56 files changed, 19 insertions, 2 deletions

diff --git a/.github/ALL_BSP_COMPILE.json b/.github/ALL_BSP_COMPILE.json
index 9b19f85eff..c88bfaa81a 100644
--- a/.github/ALL_BSP_COMPILE.json
+++ b/.github/ALL_BSP_COMPILE.json
@@ -459,7 +459,7 @@
       "RTT_BSP": "ESP32C3",
       "RTT_TOOL_CHAIN": "sourcery-riscv32-esp32",
       "SUB_RTT_BSP": [
-        "ESP32_C3"
+        "ESP/ESP32_C3"
       ]
     },
     {
diff --git a/bsp/ESP32_C3/.ci/attachconfig/ci.attachconfig.yml b/bsp/ESP/ESP32_C3/.ci/attachconfig/ci.attachconfig.yml
index a2a990be1c..a2a990be1c 100644
--- a/bsp/ESP32_C3/.ci/attachconfig/ci.attachconfig.yml
+++ b/bsp/ESP/ESP32_C3/.ci/attachconfig/ci.attachconfig.yml
diff --git a/bsp/ESP32_C3/.config b/bsp/ESP/ESP32_C3/.config
index 1fdf626402..1fdf626402 100644
--- a/bsp/ESP32_C3/.config
+++ b/bsp/ESP/ESP32_C3/.config
diff --git a/bsp/ESP32_C3/Kconfig b/bsp/ESP/ESP32_C3/Kconfig
index 09feb04acd..49c80301b3 100644
--- a/bsp/ESP32_C3/Kconfig
+++ b/bsp/ESP/ESP32_C3/Kconfig
@@ -8,4 +8,4 @@ PKGS_DIR := packages
 
 source "$(RTT_DIR)/Kconfig"
 osource "$PKGS_DIR/Kconfig"
-rsource "drivers/Kconfig"
+rsource "../libraries/drivers/Kconfig"
diff --git a/bsp/ESP32_C3/README.md b/bsp/ESP/ESP32_C3/README.md
index 5f61eff7d4..5f61eff7d4 100644
--- a/bsp/ESP32_C3/README.md
+++ b/bsp/ESP/ESP32_C3/README.md
diff --git a/bsp/ESP32_C3/README_ZH.md b/bsp/ESP/ESP32_C3/README_ZH.md
index c0014ac86f..c0014ac86f 100644
--- a/bsp/ESP32_C3/README_ZH.md
+++ b/bsp/ESP/ESP32_C3/README_ZH.md
diff --git a/bsp/ESP32_C3/SConscript b/bsp/ESP/ESP32_C3/SConscript
index fe0ae941ae..fe0ae941ae 100644
--- a/bsp/ESP32_C3/SConscript
+++ b/bsp/ESP/ESP32_C3/SConscript
diff --git a/bsp/ESP32_C3/SConstruct b/bsp/ESP/ESP32_C3/SConstruct
index 916d12345f..916d12345f 100644
--- a/bsp/ESP32_C3/SConstruct
+++ b/bsp/ESP/ESP32_C3/SConstruct
diff --git a/bsp/ESP32_C3/builtin_imgs/.gitignore b/bsp/ESP/ESP32_C3/builtin_imgs/.gitignore
index eae8fc543e..eae8fc543e 100644
--- a/bsp/ESP32_C3/builtin_imgs/.gitignore
+++ b/bsp/ESP/ESP32_C3/builtin_imgs/.gitignore
diff --git a/bsp/ESP32_C3/builtin_imgs/bootloader.bin b/bsp/ESP/ESP32_C3/builtin_imgs/bootloader.bin
index cce9cb2086..cce9cb2086 100644
--- a/bsp/ESP32_C3/builtin_imgs/bootloader.bin
+++ b/bsp/ESP/ESP32_C3/builtin_imgs/bootloader.bin
diff --git a/bsp/ESP32_C3/builtin_imgs/partition-table.bin b/bsp/ESP/ESP32_C3/builtin_imgs/partition-table.bin
index 0dc4a341ac..0dc4a341ac 100644
--- a/bsp/ESP32_C3/builtin_imgs/partition-table.bin
+++ b/bsp/ESP/ESP32_C3/builtin_imgs/partition-table.bin
diff --git a/bsp/ESP32_C3/docker/Dockerfile b/bsp/ESP/ESP32_C3/docker/Dockerfile
index 1382c5cd38..1382c5cd38 100644
--- a/bsp/ESP32_C3/docker/Dockerfile
+++ b/bsp/ESP/ESP32_C3/docker/Dockerfile
diff --git a/bsp/ESP32_C3/esp32c3.gpb b/bsp/ESP/ESP32_C3/esp32c3.gpb
index 3348872693..3348872693 100644
--- a/bsp/ESP32_C3/esp32c3.gpb
+++ b/bsp/ESP/ESP32_C3/esp32c3.gpb
diff --git a/bsp/ESP32_C3/idf_port/SConscript b/bsp/ESP/ESP32_C3/idf_port/SConscript
index 6eee3b883d..6eee3b883d 100644
--- a/bsp/ESP32_C3/idf_port/SConscript
+++ b/bsp/ESP/ESP32_C3/idf_port/SConscript
diff --git a/bsp/ESP32_C3/idf_port/include/freertos/FreeRTOSConfig.h b/bsp/ESP/ESP32_C3/idf_port/include/freertos/FreeRTOSConfig.h
index b17e2c9401..b17e2c9401 100644
--- a/bsp/ESP32_C3/idf_port/include/freertos/FreeRTOSConfig.h
+++ b/bsp/ESP/ESP32_C3/idf_port/include/freertos/FreeRTOSConfig.h
diff --git a/bsp/ESP32_C3/idf_port/include/freertos/FreeRTOSConfig_arch.h b/bsp/ESP/ESP32_C3/idf_port/include/freertos/FreeRTOSConfig_arch.h
index 2152c2778e..2152c2778e 100644
--- a/bsp/ESP32_C3/idf_port/include/freertos/FreeRTOSConfig_arch.h
+++ b/bsp/ESP/ESP32_C3/idf_port/include/freertos/FreeRTOSConfig_arch.h
diff --git a/bsp/ESP32_C3/idf_port/include/freertos/freertos_tasks_c_additions.h b/bsp/ESP/ESP32_C3/idf_port/include/freertos/freertos_tasks_c_additions.h
index 96fc4f73ce..96fc4f73ce 100644
--- a/bsp/ESP32_C3/idf_port/include/freertos/freertos_tasks_c_additions.h
+++ b/bsp/ESP/ESP32_C3/idf_port/include/freertos/freertos_tasks_c_additions.h
diff --git a/bsp/ESP32_C3/idf_port/include/freertos/portmacro.h b/bsp/ESP/ESP32_C3/idf_port/include/freertos/portmacro.h
index 875d4e9971..875d4e9971 100644
--- a/bsp/ESP32_C3/idf_port/include/freertos/portmacro.h
+++ b/bsp/ESP/ESP32_C3/idf_port/include/freertos/portmacro.h
diff --git a/bsp/ESP32_C3/idf_port/include/freertos/task_snapshot.h b/bsp/ESP/ESP32_C3/idf_port/include/freertos/task_snapshot.h
index 9238b9f5e7..9238b9f5e7 100644
--- a/bsp/ESP32_C3/idf_port/include/freertos/task_snapshot.h
+++ b/bsp/ESP/ESP32_C3/idf_port/include/freertos/task_snapshot.h
diff --git a/bsp/ESP32_C3/idf_port/ld/memory.ld b/bsp/ESP/ESP32_C3/idf_port/ld/memory.ld
index 073b63d42a..073b63d42a 100644
--- a/bsp/ESP32_C3/idf_port/ld/memory.ld
+++ b/bsp/ESP/ESP32_C3/idf_port/ld/memory.ld
diff --git a/bsp/ESP32_C3/idf_port/ld/sections.ld b/bsp/ESP/ESP32_C3/idf_port/ld/sections.ld
index ddb6f7d4e8..ddb6f7d4e8 100644
--- a/bsp/ESP32_C3/idf_port/ld/sections.ld
+++ b/bsp/ESP/ESP32_C3/idf_port/ld/sections.ld
diff --git a/bsp/ESP32_C3/idf_port/src/port.c b/bsp/ESP/ESP32_C3/idf_port/src/port.c
index fb5321fe14..fb5321fe14 100644
--- a/bsp/ESP32_C3/idf_port/src/port.c
+++ b/bsp/ESP/ESP32_C3/idf_port/src/port.c
diff --git a/bsp/ESP32_C3/idf_port/src/port_common.c b/bsp/ESP/ESP32_C3/idf_port/src/port_common.c
index ad5a68bfb8..ad5a68bfb8 100644
--- a/bsp/ESP32_C3/idf_port/src/port_common.c
+++ b/bsp/ESP/ESP32_C3/idf_port/src/port_common.c
diff --git a/bsp/ESP32_C3/idf_port/src/rt-thread_balance_stub.c b/bsp/ESP/ESP32_C3/idf_port/src/rt-thread_balance_stub.c
index 8721919477..8721919477 100644
--- a/bsp/ESP32_C3/idf_port/src/rt-thread_balance_stub.c
+++ b/bsp/ESP/ESP32_C3/idf_port/src/rt-thread_balance_stub.c
diff --git a/bsp/ESP32_C3/idf_port/src/x509_crt_bundle.S b/bsp/ESP/ESP32_C3/idf_port/src/x509_crt_bundle.S
index 1e78f8b5bb..1e78f8b5bb 100644
--- a/bsp/ESP32_C3/idf_port/src/x509_crt_bundle.S
+++ b/bsp/ESP/ESP32_C3/idf_port/src/x509_crt_bundle.S
diff --git a/bsp/ESP32_C3/images/flash_download_tools.png b/bsp/ESP/ESP32_C3/images/flash_download_tools.png
index 5f0d8643e6..5f0d8643e6 100644
--- a/bsp/ESP32_C3/images/flash_download_tools.png
+++ b/bsp/ESP/ESP32_C3/images/flash_download_tools.png
diff --git a/bsp/ESP32_C3/images/hx_shang.png b/bsp/ESP/ESP32_C3/images/hx_shang.png
index 736923aa83..736923aa83 100644
--- a/bsp/ESP32_C3/images/hx_shang.png
+++ b/bsp/ESP/ESP32_C3/images/hx_shang.png
diff --git a/bsp/ESP32_C3/images/luatos_esp32c3.png b/bsp/ESP/ESP32_C3/images/luatos_esp32c3.png
index 5503af8690..5503af8690 100644
--- a/bsp/ESP32_C3/images/luatos_esp32c3.png
+++ b/bsp/ESP/ESP32_C3/images/luatos_esp32c3.png
diff --git a/bsp/ESP32_C3/main/SConscript b/bsp/ESP/ESP32_C3/main/SConscript
index 284e033584..284e033584 100644
--- a/bsp/ESP32_C3/main/SConscript
+++ b/bsp/ESP/ESP32_C3/main/SConscript
diff --git a/bsp/ESP32_C3/main/main.c b/bsp/ESP/ESP32_C3/main/main.c
index 68ddae8641..68ddae8641 100644
--- a/bsp/ESP32_C3/main/main.c
+++ b/bsp/ESP/ESP32_C3/main/main.c
diff --git a/bsp/ESP32_C3/rtconfig.h b/bsp/ESP/ESP32_C3/rtconfig.h
index 59efe874c2..59efe874c2 100644
--- a/bsp/ESP32_C3/rtconfig.h
+++ b/bsp/ESP/ESP32_C3/rtconfig.h
diff --git a/bsp/ESP32_C3/rtconfig.py b/bsp/ESP/ESP32_C3/rtconfig.py
index c1c04fc739..c1c04fc739 100644
--- a/bsp/ESP32_C3/rtconfig.py
+++ b/bsp/ESP/ESP32_C3/rtconfig.py
diff --git a/bsp/ESP32_C3/drivers/Kconfig b/bsp/ESP/libraries/drivers/Kconfig
index b7cb8f1275..b7cb8f1275 100644
--- a/bsp/ESP32_C3/drivers/Kconfig
+++ b/bsp/ESP/libraries/drivers/Kconfig
diff --git a/bsp/ESP32_C3/drivers/SConscript b/bsp/ESP/libraries/drivers/SConscript
index 74d91cca65..74d91cca65 100644
--- a/bsp/ESP32_C3/drivers/SConscript
+++ b/bsp/ESP/libraries/drivers/SConscript
diff --git a/bsp/ESP32_C3/drivers/board.c b/bsp/ESP/libraries/drivers/board.c
index 2556ec1b8b..2556ec1b8b 100644
--- a/bsp/ESP32_C3/drivers/board.c
+++ b/bsp/ESP/libraries/drivers/board.c
diff --git a/bsp/ESP32_C3/drivers/board.h b/bsp/ESP/libraries/drivers/board.h
index d9a6655dc8..d9a6655dc8 100644
--- a/bsp/ESP32_C3/drivers/board.h
+++ b/bsp/ESP/libraries/drivers/board.h
diff --git a/bsp/ESP32_C3/drivers/drv_adc.c b/bsp/ESP/libraries/drivers/drv_adc.c
index 7d8190dfe7..7d8190dfe7 100644
--- a/bsp/ESP32_C3/drivers/drv_adc.c
+++ b/bsp/ESP/libraries/drivers/drv_adc.c
diff --git a/bsp/ESP32_C3/drivers/drv_adc.h b/bsp/ESP/libraries/drivers/drv_adc.h
index 188af73b1c..188af73b1c 100644
--- a/bsp/ESP32_C3/drivers/drv_adc.h
+++ b/bsp/ESP/libraries/drivers/drv_adc.h
diff --git a/bsp/ESP32_C3/drivers/drv_gpio.c b/bsp/ESP/libraries/drivers/drv_gpio.c
index 77721db22a..77721db22a 100644
--- a/bsp/ESP32_C3/drivers/drv_gpio.c
+++ b/bsp/ESP/libraries/drivers/drv_gpio.c
diff --git a/bsp/ESP32_C3/drivers/drv_gpio.h b/bsp/ESP/libraries/drivers/drv_gpio.h
index ea9d1b0f6a..ea9d1b0f6a 100644
--- a/bsp/ESP32_C3/drivers/drv_gpio.h
+++ b/bsp/ESP/libraries/drivers/drv_gpio.h
diff --git a/bsp/ESP32_C3/drivers/drv_hw_i2c.c b/bsp/ESP/libraries/drivers/drv_hw_i2c.c
index 27f2486341..27f2486341 100644
--- a/bsp/ESP32_C3/drivers/drv_hw_i2c.c
+++ b/bsp/ESP/libraries/drivers/drv_hw_i2c.c
diff --git a/bsp/ESP32_C3/drivers/drv_hw_i2c.h b/bsp/ESP/libraries/drivers/drv_hw_i2c.h
index de2e8a39a6..de2e8a39a6 100644
--- a/bsp/ESP32_C3/drivers/drv_hw_i2c.h
+++ b/bsp/ESP/libraries/drivers/drv_hw_i2c.h
diff --git a/bsp/ESP32_C3/drivers/drv_pwm.c b/bsp/ESP/libraries/drivers/drv_pwm.c
index acbf1bf4be..acbf1bf4be 100644
--- a/bsp/ESP32_C3/drivers/drv_pwm.c
+++ b/bsp/ESP/libraries/drivers/drv_pwm.c
diff --git a/bsp/ESP32_C3/drivers/drv_pwm.h b/bsp/ESP/libraries/drivers/drv_pwm.h
index ad0652474b..ad0652474b 100644
--- a/bsp/ESP32_C3/drivers/drv_pwm.h
+++ b/bsp/ESP/libraries/drivers/drv_pwm.h
diff --git a/bsp/ESP32_C3/drivers/drv_spi.c b/bsp/ESP/libraries/drivers/drv_spi.c
index 389e75a7ac..389e75a7ac 100644
--- a/bsp/ESP32_C3/drivers/drv_spi.c
+++ b/bsp/ESP/libraries/drivers/drv_spi.c
diff --git a/bsp/ESP32_C3/drivers/drv_spi.h b/bsp/ESP/libraries/drivers/drv_spi.h
index accd3a2551..accd3a2551 100644
--- a/bsp/ESP32_C3/drivers/drv_spi.h
+++ b/bsp/ESP/libraries/drivers/drv_spi.h
diff --git a/bsp/ESP32_C3/drivers/drv_sw_i2c.c b/bsp/ESP/libraries/drivers/drv_sw_i2c.c
index fbfed4d71d..fbfed4d71d 100644
--- a/bsp/ESP32_C3/drivers/drv_sw_i2c.c
+++ b/bsp/ESP/libraries/drivers/drv_sw_i2c.c
diff --git a/bsp/ESP32_C3/drivers/drv_sw_i2c.h b/bsp/ESP/libraries/drivers/drv_sw_i2c.h
index ab353e473f..ab353e473f 100644
--- a/bsp/ESP32_C3/drivers/drv_sw_i2c.h
+++ b/bsp/ESP/libraries/drivers/drv_sw_i2c.h
diff --git a/bsp/ESP32_C3/drivers/drv_timer.c b/bsp/ESP/libraries/drivers/drv_timer.c
index 7c0766e609..7c0766e609 100644
--- a/bsp/ESP32_C3/drivers/drv_timer.c
+++ b/bsp/ESP/libraries/drivers/drv_timer.c
diff --git a/bsp/ESP32_C3/drivers/drv_timer.h b/bsp/ESP/libraries/drivers/drv_timer.h
index 87a1ee495c..87a1ee495c 100644
--- a/bsp/ESP32_C3/drivers/drv_timer.h
+++ b/bsp/ESP/libraries/drivers/drv_timer.h
diff --git a/bsp/ESP32_C3/drivers/drv_uart.c b/bsp/ESP/libraries/drivers/drv_uart.c
index 58bac211f2..58bac211f2 100644
--- a/bsp/ESP32_C3/drivers/drv_uart.c
+++ b/bsp/ESP/libraries/drivers/drv_uart.c
diff --git a/bsp/ESP32_C3/drivers/drv_uart.h b/bsp/ESP/libraries/drivers/drv_uart.h
index f47a29b116..f47a29b116 100644
--- a/bsp/ESP32_C3/drivers/drv_uart.h
+++ b/bsp/ESP/libraries/drivers/drv_uart.h
diff --git a/bsp/ESP32_C3/drivers/drv_wifi.c b/bsp/ESP/libraries/drivers/drv_wifi.c
index 61b643ed8c..61b643ed8c 100644
--- a/bsp/ESP32_C3/drivers/drv_wifi.c
+++ b/bsp/ESP/libraries/drivers/drv_wifi.c
diff --git a/bsp/ESP32_C3/drivers/drv_wifi.h b/bsp/ESP/libraries/drivers/drv_wifi.h
index 42b6e0b55a..42b6e0b55a 100644
--- a/bsp/ESP32_C3/drivers/drv_wifi.h
+++ b/bsp/ESP/libraries/drivers/drv_wifi.h
diff --git a/bsp/ESP32_C3/drivers/sdkconfig.h b/bsp/ESP/libraries/drivers/sdkconfig.h
index 5006d687d4..5006d687d4 100644
--- a/bsp/ESP32_C3/drivers/sdkconfig.h
+++ b/bsp/ESP/libraries/drivers/sdkconfig.h
diff --git a/bsp/ESP/tools/sdk_dist.py b/bsp/ESP/tools/sdk_dist.py
new file mode 100644
index 0000000000..11a39a60de
--- /dev/null
+++ b/bsp/ESP/tools/sdk_dist.py
@@ -0,0 +1,17 @@
+import os
+import sys
+import shutil
+
+cwd_path = os.getcwd()
+sys.path.append(os.path.join(os.path.dirname(cwd_path), 'rt-thread', 'tools'))
+
+
+# BSP dist function
+def dist_do_building(BSP_ROOT, dist_dir):
+    from mkdist import bsp_copy_files
+    import rtconfig
+
+
+    print("=> copy bsp drivers")
+    bsp_copy_files(os.path.join(library_path, 'drivers'), os.path.join(library_dir, 'drivers'))
+    shutil.copyfile(os.path.join(library_path, 'Kconfig'), os.path.join(library_dir, 'Kconfig'))