From c1613ec7cb5b0ccac44ecc6e3ed237105fba573b Mon Sep 17 00:00:00 2001
From: Meco Man <920369182@qq.com>
Date: Wed, 27 Jul 2022 18:06:16 -0400
Subject: [PATCH] =?UTF-8?q?[k210]=20=E4=BD=BF=E7=94=A8=E6=96=B0=E7=89=88?=
 =?UTF-8?q?=E7=9A=84SDK=E8=BD=AF=E4=BB=B6=E5=8C=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bsp/k210/.config        | 47 ++++++++++++++++++++++++++++-------------
 bsp/k210/Kconfig        |  2 +-
 bsp/k210/driver/board.h |  4 ----
 bsp/k210/rtconfig.h     | 14 ++++++------
 4 files changed, 40 insertions(+), 27 deletions(-)

diff --git a/bsp/k210/.config b/bsp/k210/.config
index 50cc207996..7708cda454 100644
--- a/bsp/k210/.config
+++ b/bsp/k210/.config
@@ -31,7 +31,7 @@ CONFIG_SYSTEM_THREAD_STACK_SIZE=4096
 # CONFIG_RT_KSERVICE_USING_STDLIB is not set
 # CONFIG_RT_KSERVICE_USING_TINY_SIZE is not set
 # CONFIG_RT_USING_TINY_FFS is not set
-# CONFIG_RT_PRINTF_LONGLONG is not set
+CONFIG_RT_KPRINTF_USING_LONGLONG=y
 CONFIG_RT_DEBUG=y
 CONFIG_RT_DEBUG_COLOR=y
 CONFIG_RT_DEBUG_INIT_CONFIG=y
@@ -83,7 +83,7 @@ CONFIG_RT_USING_DEVICE=y
 CONFIG_RT_USING_CONSOLE=y
 CONFIG_RT_CONSOLEBUF_SIZE=128
 CONFIG_RT_CONSOLE_DEVICE_NAME="uarths"
-CONFIG_RT_VER_NUM=0x40100
+CONFIG_RT_VER_NUM=0x40101
 CONFIG_ARCH_CPU_64BIT=y
 # CONFIG_RT_USING_CPU_FFS is not set
 CONFIG_ARCH_RISCV=y
@@ -265,6 +265,7 @@ CONFIG_ULOG_OUTPUT_LEVEL=y
 CONFIG_ULOG_OUTPUT_TAG=y
 # CONFIG_ULOG_OUTPUT_THREAD_NAME is not set
 CONFIG_ULOG_BACKEND_USING_CONSOLE=y
+# CONFIG_ULOG_BACKEND_USING_FILE is not set
 # CONFIG_ULOG_USING_FILTER is not set
 # CONFIG_ULOG_USING_SYSLOG is not set
 # CONFIG_RT_USING_UTEST is not set
@@ -335,6 +336,7 @@ CONFIG_ULOG_BACKEND_USING_CONSOLE=y
 # CONFIG_PKG_USING_UCLOUD_IOT_SDK is not set
 # CONFIG_PKG_USING_JOYLINK is not set
 # CONFIG_PKG_USING_EZ_IOT_OS is not set
+# CONFIG_PKG_USING_IOTSHARP_SDK is not set
 # CONFIG_PKG_USING_NIMBLE is not set
 # CONFIG_PKG_USING_LLSYNC_SDK_ADAPTER is not set
 # CONFIG_PKG_USING_OTA_DOWNLOADER is not set
@@ -368,12 +370,14 @@ CONFIG_ULOG_BACKEND_USING_CONSOLE=y
 # CONFIG_PKG_USING_HM is not set
 # CONFIG_PKG_USING_SMALL_MODBUS is not set
 # CONFIG_PKG_USING_NET_SERVER is not set
+# CONFIG_PKG_USING_ZFTP is not set
 
 #
 # security packages
 #
 # CONFIG_PKG_USING_MBEDTLS is not set
 # CONFIG_PKG_USING_LIBSODIUM is not set
+# CONFIG_PKG_USING_LIBHYDROGEN is not set
 # CONFIG_PKG_USING_TINYCRYPT is not set
 # CONFIG_PKG_USING_TFM is not set
 # CONFIG_PKG_USING_YD_CRYPTO is not set
@@ -391,6 +395,7 @@ CONFIG_ULOG_BACKEND_USING_CONSOLE=y
 # CONFIG_PKG_USING_RAPIDJSON is not set
 # CONFIG_PKG_USING_JSMN is not set
 # CONFIG_PKG_USING_AGILE_JSMN is not set
+# CONFIG_PKG_USING_PARSON is not set
 
 #
 # XML: Extensible Markup Language
@@ -402,6 +407,7 @@ CONFIG_ULOG_BACKEND_USING_CONSOLE=y
 # CONFIG_PKG_USING_JERRYSCRIPT is not set
 # CONFIG_PKG_USING_MICROPYTHON is not set
 # CONFIG_PKG_USING_PIKASCRIPT is not set
+# CONFIG_PKG_USING_RTT_RUST is not set
 
 #
 # multimedia packages
@@ -413,6 +419,7 @@ CONFIG_ULOG_BACKEND_USING_CONSOLE=y
 # CONFIG_PKG_USING_LVGL is not set
 # CONFIG_PKG_USING_LITTLEVGL2RTT is not set
 # CONFIG_PKG_USING_LV_MUSIC_DEMO is not set
+# CONFIG_PKG_USING_GUI_GUIDER_DEMO is not set
 
 #
 # u8g2: a monochrome graphic library
@@ -487,6 +494,9 @@ CONFIG_ULOG_BACKEND_USING_CONSOLE=y
 # CONFIG_PKG_USING_FDT is not set
 # CONFIG_PKG_USING_CBOX is not set
 # CONFIG_PKG_USING_SNOWFLAKE is not set
+# CONFIG_PKG_USING_HASH_MATCH is not set
+# CONFIG_PKG_USING_FIRE_PID_CURVE is not set
+# CONFIG_PKG_USING_ARMV7M_DWT_TOOL is not set
 
 #
 # system packages
@@ -499,14 +509,6 @@ CONFIG_ULOG_BACKEND_USING_CONSOLE=y
 # CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set
 # CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set
 
-#
-# POSIX extension functions
-#
-# CONFIG_PKG_USING_POSIX_GETLINE is not set
-# CONFIG_PKG_USING_POSIX_WCWIDTH is not set
-# CONFIG_PKG_USING_POSIX_ITOA is not set
-# CONFIG_PKG_USING_POSIX_STRINGS is not set
-
 #
 # acceleration: Assembly language or algorithmic acceleration packages
 #
@@ -518,6 +520,7 @@ CONFIG_ULOG_BACKEND_USING_CONSOLE=y
 # CMSIS: ARM Cortex-M Microcontroller Software Interface Standard
 #
 # CONFIG_PKG_USING_CMSIS_5 is not set
+# CONFIG_PKG_USING_CMSIS_RTOS1 is not set
 # CONFIG_PKG_USING_CMSIS_RTOS2 is not set
 
 #
@@ -530,9 +533,11 @@ CONFIG_ULOG_BACKEND_USING_CONSOLE=y
 # CONFIG_PKG_USING_UC_COMMON is not set
 # CONFIG_PKG_USING_UC_MODBUS is not set
 # CONFIG_PKG_USING_RTDUINO is not set
+# CONFIG_PKG_USING_FREERTOS_WRAPPER is not set
 # CONFIG_PKG_USING_CAIRO is not set
 # CONFIG_PKG_USING_PIXMAN is not set
 # CONFIG_PKG_USING_PARTITION is not set
+# CONFIG_PKG_USING_PERF_COUNTER is not set
 # CONFIG_PKG_USING_FLASHDB is not set
 # CONFIG_PKG_USING_SQLITE is not set
 # CONFIG_PKG_USING_RTI is not set
@@ -560,6 +565,8 @@ CONFIG_ULOG_BACKEND_USING_CONSOLE=y
 # CONFIG_PKG_USING_TINYUSB is not set
 # CONFIG_PKG_USING_CHERRYUSB is not set
 # CONFIG_PKG_USING_KMULTI_RTIMER is not set
+# CONFIG_PKG_USING_TFDB is not set
+# CONFIG_PKG_USING_QPC is not set
 
 #
 # peripheral libraries and drivers
@@ -568,8 +575,10 @@ CONFIG_ULOG_BACKEND_USING_CONSOLE=y
 # CONFIG_PKG_USING_REALTEK_AMEBA is not set
 # CONFIG_PKG_USING_SHT2X is not set
 # CONFIG_PKG_USING_SHT3X is not set
+# 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_ICM20608 is not set
 # CONFIG_PKG_USING_BUTTON is not set
 # CONFIG_PKG_USING_PCF8574 is not set
@@ -581,12 +590,17 @@ CONFIG_ULOG_BACKEND_USING_CONSOLE=y
 # CONFIG_PKG_USING_NRF5X_SDK is not set
 # CONFIG_PKG_USING_NRFX is not set
 # CONFIG_PKG_USING_WM_LIBRARIES is not set
-CONFIG_PKG_USING_KENDRYTE_SDK=y
-CONFIG_PKG_KENDRYTE_SDK_PATH="/packages/peripherals/kendryte-sdk"
-CONFIG_PKG_USING_KENDRYTE_SDK_V057=y
+
+#
+# kendryte-sdk: Kendryte SDK
+#
+CONFIG_PKG_USING_K210_SDK=y
+CONFIG_PKG_K210_SDK_PATH="/packages/peripherals/kendryte-sdk/K210-SDK"
+CONFIG_PKG_USING_K210_SDK_LATEST_VERSION=y
+CONFIG_PKG_K210_SDK_VER="latest"
+# CONFIG_PKG_USING_KENDRYTE_SDK is not set
+# CONFIG_PKG_USING_KENDRYTE_SDK_V057 is not set
 # CONFIG_PKG_USING_KENDRYTE_SDK_LATEST_VERSION is not set
-CONFIG_PKG_KENDRYTE_SDK_VER="v0.5.7"
-CONFIG_PKG_KENDRYTE_SDK_VERNUM=0x0057
 # CONFIG_PKG_USING_INFRARED is not set
 # CONFIG_PKG_USING_MULTI_INFRARED is not set
 # CONFIG_PKG_USING_AGILE_BUTTON is not set
@@ -647,6 +661,7 @@ CONFIG_PKG_KENDRYTE_SDK_VERNUM=0x0057
 # CONFIG_PKG_USING_MB85RS16 is not set
 # CONFIG_PKG_USING_CW2015 is not set
 # CONFIG_PKG_USING_RFM300 is not set
+# CONFIG_PKG_USING_IO_INPUT_FILTER is not set
 
 #
 # AI packages
@@ -720,6 +735,8 @@ CONFIG_PKG_KENDRYTE_SDK_VERNUM=0x0057
 # CONFIG_PKG_USING_CONTROLLER is not set
 # CONFIG_PKG_USING_PHASE_LOCKED_LOOP is not set
 # CONFIG_PKG_USING_MFBD is not set
+# CONFIG_PKG_USING_SLCAN2RTT is not set
+# CONFIG_PKG_USING_SOEM is not set
 CONFIG_BOARD_K210_EVB=y
 
 #
diff --git a/bsp/k210/Kconfig b/bsp/k210/Kconfig
index 61ba3631c0..615dfd2f91 100644
--- a/bsp/k210/Kconfig
+++ b/bsp/k210/Kconfig
@@ -22,9 +22,9 @@ config BOARD_K210_EVB
     bool
     select ARCH_RISCV64
     select ARCH_RISCV_FPU_S
-    select PKG_USING_KENDRYTE_SDK
     select RT_USING_COMPONENTS_INIT
     select RT_USING_USER_MAIN
+    select PKG_USING_K210_SDK
     default y
 
 source "driver/Kconfig"
diff --git a/bsp/k210/driver/board.h b/bsp/k210/driver/board.h
index 5b988d6e34..0464bad1f3 100644
--- a/bsp/k210/driver/board.h
+++ b/bsp/k210/driver/board.h
@@ -13,10 +13,6 @@
 
 #include <rtconfig.h>
 
-#if PKG_KENDRYTE_SDK_VERNUM < 0x0054
-#error The version of Kendryte sdk is too old, please update to V0.5.4 or newer
-#endif
-
 extern unsigned int __bss_start;
 extern unsigned int __bss_end;
 
diff --git a/bsp/k210/rtconfig.h b/bsp/k210/rtconfig.h
index 65b7f07dab..86b5d3676f 100644
--- a/bsp/k210/rtconfig.h
+++ b/bsp/k210/rtconfig.h
@@ -23,6 +23,7 @@
 
 /* kservice optimization */
 
+#define RT_KPRINTF_USING_LONGLONG
 #define RT_DEBUG
 #define RT_DEBUG_COLOR
 #define RT_DEBUG_INIT_CONFIG
@@ -52,7 +53,7 @@
 #define RT_USING_CONSOLE
 #define RT_CONSOLEBUF_SIZE 128
 #define RT_CONSOLE_DEVICE_NAME "uarths"
-#define RT_VER_NUM 0x40100
+#define RT_VER_NUM 0x40101
 #define ARCH_CPU_64BIT
 #define ARCH_RISCV
 #define ARCH_RISCV_FPU
@@ -203,9 +204,6 @@
 /* enhanced kernel services */
 
 
-/* POSIX extension functions */
-
-
 /* acceleration: Assembly language or algorithmic acceleration packages */
 
 
@@ -217,9 +215,11 @@
 
 /* peripheral libraries and drivers */
 
-#define PKG_USING_KENDRYTE_SDK
-#define PKG_USING_KENDRYTE_SDK_V057
-#define PKG_KENDRYTE_SDK_VERNUM 0x0057
+
+/* kendryte-sdk: Kendryte SDK */
+
+#define PKG_USING_K210_SDK
+#define PKG_USING_K210_SDK_LATEST_VERSION
 
 /* AI packages */