Merge branch 'RT-Thread:master' into master

Author: illustriousness

MAINTAINERS

@@ -49,6 +49,10 @@ tag: bsp_cvitek
 path: bsp/cvitek
 owners: Chen Wang(unicornx)<[email protected]>
 
+tag: bsp_gd32105c-eval
+path: bsp/gd32/arm/gd32105c-eval
+owners: Xiansong Cao(CXSforHPU)<[email protected]>
+
 tag: bsp_gd32470z-lckfb
 path: bsp/gd32/arm/gd32470z-lckfb
 owners: Wu Ying Xiang(godmial)<[email protected]>
@@ -99,7 +103,7 @@ owners: PengXu(LittleGreyG)<[email protected]>
 
 tag: documentation
 path: documentation
-owners: Chen Wang(unicornx)<[email protected]>, Guorui Li(GorrayLi)<[email protected]>, Lian Wang(lianux-mm)<[email protected]>
+owners: Chen Wang(unicornx)<[email protected]>, Guorui Li(GorrayLi)<[email protected]>, Lian Wang(lianux-mm)<[email protected]>, Xiansong Cao(CXSforHPU)<[email protected]>
 
 tag: driver_can
 path: components/drivers/can

bsp/hc32/ev_hc32f448_lqfp80/.config

@@ -496,6 +496,7 @@ CONFIG_RT_LIBC_TZ_DEFAULT_SEC=0
 # CONFIG_PKG_USING_QMODBUS is not set
 # CONFIG_PKG_USING_PNET is not set
 # CONFIG_PKG_USING_OPENER is not set
+# CONFIG_PKG_USING_FREEMQTT is not set
 # end of IoT - internet of things
 
 #
@@ -725,6 +726,7 @@ CONFIG_RT_LIBC_TZ_DEFAULT_SEC=0
 # CONFIG_PKG_USING_RMP is not set
 # CONFIG_PKG_USING_R_RHEALSTONE is not set
 # CONFIG_PKG_USING_HEARTBEAT is not set
+# CONFIG_PKG_USING_MICRO_ROS_RTTHREAD_PACKAGE is not set
 # end of system packages
 
 #
@@ -848,6 +850,14 @@ CONFIG_RT_LIBC_TZ_DEFAULT_SEC=0
 #
 # HC32 DDL Drivers
 #
+CONFIG_PKG_USING_HC32F4_CMSIS_DRIVER=y
+CONFIG_PKG_HC32F4_CMSIS_DRIVER_PATH="/packages/peripherals/hal-sdk/hc32/hc32_f4_cmsis"
+CONFIG_PKG_USING_HC32F4_CMSIS_DRIVER_LATEST_VERSION=y
+CONFIG_PKG_HC32F4_CMSIS_DRIVER_VER="latest"
+CONFIG_PKG_USING_HC32F4_SERIES_DRIVER=y
+CONFIG_PKG_HC32F4_SERIES_DRIVER_PATH="/packages/peripherals/hal-sdk/hc32/hc32_f4_series"
+CONFIG_PKG_USING_HC32F4_SERIES_DRIVER_LATEST_VERSION=y
+CONFIG_PKG_HC32F4_SERIES_DRIVER_VER="latest"
 # end of HC32 DDL Drivers
 
 #

bsp/hc32/ev_hc32f448_lqfp80/SConstruct

@@ -15,6 +15,25 @@ except:
     print(RTT_ROOT)
     exit(-1)
 
+def bsp_pkg_check():
+    import subprocess
+
+    check_paths = [
+        os.path.join("packages", "hc32-f4-cmsis-latest"),
+        os.path.join("packages", "hc32-f4-series-latest")
+    ]
+
+    need_update = not all(os.path.exists(p) for p in check_paths)
+
+    if need_update:
+        print("\n===============================================================================")
+        print("Dependency packages missing, please running 'pkgs --update'...")
+        print("If no packages are fetched, run 'pkgs --upgrade' first, then 'pkgs --update'...")
+        print("===============================================================================")
+        exit(1)
+
+RegisterPreBuildingAction(bsp_pkg_check)
+
 TARGET = 'rtthread.' + rtconfig.TARGET_EXT
 
 DefaultEnvironment(tools=[])
@@ -47,11 +66,7 @@ Export('SDK_LIB')
 # prepare building environment
 objs = PrepareBuilding(env, RTT_ROOT, has_libcpu=False)
 
-hc32_library = 'hc32f448_ddl'
-rtconfig.BSP_LIBRARY_TYPE = hc32_library
-
-# include libraries
-objs.extend(SConscript(os.path.join(libraries_path_prefix, hc32_library, 'SConscript')))
+rtconfig.BSP_LIBRARY_TYPE = None
 
 # include drivers
 objs.extend(SConscript(os.path.join(libraries_path_prefix, 'hc32_drivers', 'SConscript')))

bsp/hc32/ev_hc32f448_lqfp80/board/SConscript

@@ -1,9 +1,6 @@
 import os
-import rtconfig
 from building import *
 
-Import('SDK_LIB')
-
 cwd = GetCurrentDir()
 
 # add general drivers
@@ -16,14 +13,6 @@ path =  [cwd]
 path += [cwd + '/ports']
 path += [cwd + '/config']
 
-startup_path_prefix = SDK_LIB
-
-if rtconfig.PLATFORM in ['gcc']:
-    src += [startup_path_prefix + '/hc32f448_ddl/cmsis/Device/HDSC/hc32f4xx/Source/GCC/startup_hc32f448.S']
-elif rtconfig.PLATFORM in ['armcc', 'armclang']:
-    src += [startup_path_prefix + '/hc32f448_ddl/cmsis/Device/HDSC/hc32f4xx/Source/ARM/startup_hc32f448.s']
-elif rtconfig.PLATFORM in ['iccarm']:
-    src += [startup_path_prefix + '/hc32f448_ddl/cmsis/Device/HDSC/hc32f4xx/Source/IAR/startup_hc32f448.s']
 
 CPPDEFINES = ['HC32F448', '__DEBUG']
 group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES)