[k210] 调整Kconfig结构

27 files changed, 24 insertions, 19 deletions

diff --git a/bsp/k210/.config b/bsp/k210/.config
index 89003a5d0b..1801b39a62 100644
--- a/bsp/k210/.config
+++ b/bsp/k210/.config
@@ -578,7 +578,7 @@ CONFIG_ULOG_BACKEND_USING_CONSOLE=y
 # CONFIG_PKG_USING_ADT74XX is not set
 # CONFIG_PKG_USING_AS7341 is not set
 # CONFIG_PKG_USING_STM32_SDIO is not set
-# CONFIG_PKG_USING_RTT_ESP_IDF is not set
+# CONFIG_PKG_USING_ESP_IDF is not set
 # CONFIG_PKG_USING_ICM20608 is not set
 # CONFIG_PKG_USING_BUTTON is not set
 # CONFIG_PKG_USING_PCF8574 is not set
@@ -592,7 +592,7 @@ CONFIG_ULOG_BACKEND_USING_CONSOLE=y
 # CONFIG_PKG_USING_WM_LIBRARIES is not set
 
 #
-# kendryte-sdk: Kendryte SDK
+# Kendryte SDK
 #
 CONFIG_PKG_USING_K210_SDK=y
 CONFIG_PKG_K210_SDK_PATH="/packages/peripherals/kendryte-sdk/K210-SDK"
@@ -660,6 +660,7 @@ CONFIG_PKG_K210_SDK_VER="latest"
 # CONFIG_PKG_USING_CW2015 is not set
 # CONFIG_PKG_USING_RFM300 is not set
 # CONFIG_PKG_USING_IO_INPUT_FILTER is not set
+# CONFIG_PKG_USING_RASPBERRYPI_PICO_SDK is not set
 
 #
 # AI packages
@@ -735,6 +736,7 @@ CONFIG_PKG_K210_SDK_VER="latest"
 # CONFIG_PKG_USING_MFBD is not set
 # CONFIG_PKG_USING_SLCAN2RTT is not set
 # CONFIG_PKG_USING_SOEM is not set
+CONFIG_SOC_K210=y
 CONFIG_BOARD_K210_EVB=y
 
 #
diff --git a/bsp/k210/Kconfig b/bsp/k210/Kconfig
index 615dfd2f91..438fd71df1 100644
--- a/bsp/k210/Kconfig
+++ b/bsp/k210/Kconfig
@@ -17,17 +17,7 @@ config PKGS_DIR
 
 source "$RTT_DIR/Kconfig"
 source "$PKGS_DIR/Kconfig"
-
-config BOARD_K210_EVB
-    bool
-    select ARCH_RISCV64
-    select ARCH_RISCV_FPU_S
-    select RT_USING_COMPONENTS_INIT
-    select RT_USING_USER_MAIN
-    select PKG_USING_K210_SDK
-    default y
-
-source "driver/Kconfig"
+source "drivers/Kconfig"
 
 config __STACKSIZE__
     int "stack size for interrupt"
diff --git a/bsp/k210/driver/Kconfig b/bsp/k210/drivers/Kconfig
index abca41be45..bb326a1f92 100644
--- a/bsp/k210/driver/Kconfig
+++ b/bsp/k210/drivers/Kconfig
@@ -1,3 +1,16 @@
+config SOC_K210
+    bool
+    select ARCH_RISCV64
+    select ARCH_RISCV_FPU_S
+    select PKG_USING_K210_SDK
+
+config BOARD_K210_EVB
+    bool
+    select SOC_K210
+    select RT_USING_COMPONENTS_INIT
+    select RT_USING_USER_MAIN
+    default y
+
 menu "Hardware Drivers Config"
 
 config BSP_USING_UART_HS
@@ -58,17 +71,17 @@ if BSP_USING_SPI1
         default n
     config BSP_SPI1_CLK_PIN
         int "spi1 clk pin number"
-        default 29
+        default 29
     config BSP_SPI1_D0_PIN
         int "spi1 d0 pin number"
-        default 30
+        default 30
     config BSP_SPI1_D1_PIN
         int "spi1 d1 pin number"
-        default 31
+        default 31
     if BSP_USING_SPI1_AS_QSPI
         config BSP_SPI1_D2_PIN
             int "spi1 d2 pin number"
-            default 32
+            default 32
         config BSP_SPI1_D3_PIN
             int "spi1 d3 pin number"
             default 33
@@ -199,4 +212,3 @@ if BSP_USING_CAMERA
 endif
 
 endmenu
-
diff --git a/bsp/k210/driver/SConscript b/bsp/k210/drivers/SConscript
index 9d10702655..9d10702655 100644
--- a/bsp/k210/driver/SConscript
+++ b/bsp/k210/drivers/SConscript
diff --git a/bsp/k210/driver/board.c b/bsp/k210/drivers/board.c
index 861bde3488..861bde3488 100644
--- a/bsp/k210/driver/board.c
+++ b/bsp/k210/drivers/board.c
diff --git a/bsp/k210/driver/board.h b/bsp/k210/drivers/board.h
index 0464bad1f3..0464bad1f3 100644
--- a/bsp/k210/driver/board.h
+++ b/bsp/k210/drivers/board.h
diff --git a/bsp/k210/driver/camera/SConscript b/bsp/k210/drivers/camera/SConscript
index 1a80075428..1a80075428 100644
--- a/bsp/k210/driver/camera/SConscript
+++ b/bsp/k210/drivers/camera/SConscript
diff --git a/bsp/k210/driver/camera/drv_ov5640.c b/bsp/k210/drivers/camera/drv_ov5640.c
index f67c36a2ad..f67c36a2ad 100644
--- a/bsp/k210/driver/camera/drv_ov5640.c
+++ b/bsp/k210/drivers/camera/drv_ov5640.c
diff --git a/bsp/k210/driver/camera/drv_ov5640.h b/bsp/k210/drivers/camera/drv_ov5640.h
index c68f21912d..c68f21912d 100644
--- a/bsp/k210/driver/camera/drv_ov5640.h
+++ b/bsp/k210/drivers/camera/drv_ov5640.h
diff --git a/bsp/k210/driver/camera/ov5640af.h b/bsp/k210/drivers/camera/ov5640af.h
index 75cedcf8b6..75cedcf8b6 100644
--- a/bsp/k210/driver/camera/ov5640af.h
+++ b/bsp/k210/drivers/camera/ov5640af.h
diff --git a/bsp/k210/driver/camera/ov5640cfg.h b/bsp/k210/drivers/camera/ov5640cfg.h
index bea6ef0ecf..bea6ef0ecf 100644
--- a/bsp/k210/driver/camera/ov5640cfg.h
+++ b/bsp/k210/drivers/camera/ov5640cfg.h
diff --git a/bsp/k210/driver/dmalock.c b/bsp/k210/drivers/dmalock.c
index 5ce1d26a7e..5ce1d26a7e 100644
--- a/bsp/k210/driver/dmalock.c
+++ b/bsp/k210/drivers/dmalock.c
diff --git a/bsp/k210/driver/dmalock.h b/bsp/k210/drivers/dmalock.h
index bca6a0d24a..bca6a0d24a 100644
--- a/bsp/k210/driver/dmalock.h
+++ b/bsp/k210/drivers/dmalock.h
diff --git a/bsp/k210/driver/drv_gpio.c b/bsp/k210/drivers/drv_gpio.c
index 68d67335e9..68d67335e9 100644
--- a/bsp/k210/driver/drv_gpio.c
+++ b/bsp/k210/drivers/drv_gpio.c
diff --git a/bsp/k210/driver/drv_gpio.h b/bsp/k210/drivers/drv_gpio.h
index 9aad109b78..9aad109b78 100644
--- a/bsp/k210/driver/drv_gpio.h
+++ b/bsp/k210/drivers/drv_gpio.h
diff --git a/bsp/k210/driver/drv_interrupt.c b/bsp/k210/drivers/drv_interrupt.c
index 12f582a113..12f582a113 100644
--- a/bsp/k210/driver/drv_interrupt.c
+++ b/bsp/k210/drivers/drv_interrupt.c
diff --git a/bsp/k210/driver/drv_io_config.c b/bsp/k210/drivers/drv_io_config.c
index 253749d1f2..253749d1f2 100644
--- a/bsp/k210/driver/drv_io_config.c
+++ b/bsp/k210/drivers/drv_io_config.c
diff --git a/bsp/k210/driver/drv_io_config.h b/bsp/k210/drivers/drv_io_config.h
index 2b57225a3e..2b57225a3e 100644
--- a/bsp/k210/driver/drv_io_config.h
+++ b/bsp/k210/drivers/drv_io_config.h
diff --git a/bsp/k210/driver/drv_lcd.c b/bsp/k210/drivers/drv_lcd.c
index 3e626553b7..3e626553b7 100644
--- a/bsp/k210/driver/drv_lcd.c
+++ b/bsp/k210/drivers/drv_lcd.c
diff --git a/bsp/k210/driver/drv_lcd.h b/bsp/k210/drivers/drv_lcd.h
index 76a58df3a1..76a58df3a1 100644
--- a/bsp/k210/driver/drv_lcd.h
+++ b/bsp/k210/drivers/drv_lcd.h
diff --git a/bsp/k210/driver/drv_mpylcd.c b/bsp/k210/drivers/drv_mpylcd.c
index f7665e1c9e..f7665e1c9e 100644
--- a/bsp/k210/driver/drv_mpylcd.c
+++ b/bsp/k210/drivers/drv_mpylcd.c
diff --git a/bsp/k210/driver/drv_spi.c b/bsp/k210/drivers/drv_spi.c
index accf8ed3c5..accf8ed3c5 100644
--- a/bsp/k210/driver/drv_spi.c
+++ b/bsp/k210/drivers/drv_spi.c
diff --git a/bsp/k210/driver/drv_spi.h b/bsp/k210/drivers/drv_spi.h
index 39def91085..39def91085 100644
--- a/bsp/k210/driver/drv_spi.h
+++ b/bsp/k210/drivers/drv_spi.h
diff --git a/bsp/k210/driver/drv_uart.c b/bsp/k210/drivers/drv_uart.c
index 612de48d71..612de48d71 100644
--- a/bsp/k210/driver/drv_uart.c
+++ b/bsp/k210/drivers/drv_uart.c
diff --git a/bsp/k210/driver/drv_uart.h b/bsp/k210/drivers/drv_uart.h
index 69257fb16b..69257fb16b 100644
--- a/bsp/k210/driver/drv_uart.h
+++ b/bsp/k210/drivers/drv_uart.h
diff --git a/bsp/k210/driver/heap.c b/bsp/k210/drivers/heap.c
index f1d6d2c27a..f1d6d2c27a 100644
--- a/bsp/k210/driver/heap.c
+++ b/bsp/k210/drivers/heap.c
diff --git a/bsp/k210/rtconfig.h b/bsp/k210/rtconfig.h
index 86b5d3676f..2fa1559359 100644
--- a/bsp/k210/rtconfig.h
+++ b/bsp/k210/rtconfig.h
@@ -216,7 +216,7 @@
 /* peripheral libraries and drivers */
 
 
-/* kendryte-sdk: Kendryte SDK */
+/* Kendryte SDK */
 
 #define PKG_USING_K210_SDK
 #define PKG_USING_K210_SDK_LATEST_VERSION
@@ -233,6 +233,7 @@
 
 /* entertainment: terminal games and other interesting software packages */
 
+#define SOC_K210
 #define BOARD_K210_EVB
 
 /* Hardware Drivers Config */