[BSP][novosns]更新ns800的keil模板适配

Author: rcitach

bsp/novosns/ns800/libraries/HAL_Drivers/SConscript

@@ -8,6 +8,6 @@ src = ['drv_common.c']
 path = [cwd]
 
 group = SConscript(os.path.join(cwd, 'drivers', 'SConscript'))
-group = group + DefineGroup('HAL_Driver', src, depend = [''], CPPPATH = path)
+group = group + DefineGroup('HAL_Drivers', src, depend = [''], CPPPATH = path)
 
 Return('group')

bsp/novosns/ns800/libraries/HAL_Drivers/drivers/SConscript

@@ -7,16 +7,16 @@ cwd = GetCurrentDir()
 src = []
 path = [cwd, cwd + '/config']
 
-if GetDepend(['BSP_USING_GPIO', 'RT_USING_PIN']):
+if GetDepend('BSP_USING_GPIO'):
     src += ['drv_gpio.c']
 
-if GetDepend(['BSP_USING_UART', 'RT_USING_SERIAL']):
+if GetDepend('BSP_USING_UART'):
     src += ['drv_uart.c']
 
-if GetDepend(['BSP_USING_CAN', 'RT_USING_CAN']):
+if GetDepend('BSP_USING_CAN'):
     src += ['drv_can.c']
 
-if GetDepend(['BSP_USING_ECAP']):
+if GetDepend('BSP_USING_ECAP'):
     src += ['drv_ecap.c']
 
 group = DefineGroup('HAL_Drivers', src, depend = [''], CPPPATH = path)

bsp/novosns/ns800/ns800rt7p65-nssinepad/.config

@@ -1442,10 +1442,6 @@ CONFIG_PKG_NOVOSNS_SERIES_DRIVER_VER="latest"
 #
 # On-chip Peripheral Drivers
 #
-CONFIG_BOARD_CLK_CONF=y
-CONFIG_SYSCLK_USE_PLL=y
-CONFIG_SYSCLK_SOURCE_USE_HXTL=y
-CONFIG_PLLCLK_SOURCE_USE_HXTL=y
 CONFIG_BSP_USING_GPIO=y
 # CONFIG_BSP_GPIO_PIN_IRQ is not set
 CONFIG_BSP_USING_UART=y

bsp/novosns/ns800/ns800rt7p65-nssinepad/SConscript

@@ -1,6 +1,5 @@
 # for module compiling
 import os
-Import('env')
 from building import *
 
 cwd = GetCurrentDir()

bsp/novosns/ns800/ns800rt7p65-nssinepad/SConstruct

@@ -34,7 +34,7 @@ def bsp_pkg_check():
 
 RegisterPreBuildingAction(bsp_pkg_check)
 
-TARGET = 'rt-thread.' + rtconfig.TARGET_EXT
+TARGET = 'rtthread.' + rtconfig.TARGET_EXT
 
 DefaultEnvironment(tools=[])
 env = Environment(tools = ['mingw'],
@@ -48,7 +48,7 @@ env.PrependENVPath('PATH', rtconfig.EXEC_PATH)
 if rtconfig.PLATFORM in ['iccarm']:
     env.Replace(CCCOM = ['$CC $CFLAGS $CPPFLAGS $_CPPDEFFLAGS $_CPPINCFLAGS -o $TARGET $SOURCES'])
     env.Replace(ARFLAGS = [''])
-    env.Replace(LINKCOM = env["LINKCOM"] + ' --map rt-thread.map')
+    env.Replace(LINKCOM = env["LINKCOM"] + ' --map rtthread.map')
 
 Export('env')
 Export('RTT_ROOT')

bsp/novosns/ns800/ns800rt7p65-nssinepad/board/Kconfig

@@ -1,23 +1,5 @@
 menu "On-chip Peripheral Drivers"
-    menuconfig BOARD_CLK_CONF
-        bool "Clock Configuration"
-        default y
-        if BOARD_CLK_CONF
-            config SYSCLK_USE_PLL
-                bool "Use PLL as system clock source"
-                default y
-
-            config SYSCLK_SOURCE_USE_HXTL
-                bool "Use High-Speed Crystal Oscillator (HXTL) as system clock source"
-                default y
-                depends on SYSCLK_USE_PLL
 
-            config PLLCLK_SOURCE_USE_HXTL
-                bool "Use High-Speed Crystal Oscillator (HXTL) as PLL clock source"
-                default y
-                depends on SYSCLK_USE_PLL
-        endif
-  
     menuconfig BSP_USING_GPIO
         bool "Enable GPIO"
         select RT_USING_PIN

bsp/novosns/ns800/ns800rt7p65-nssinepad/board/SConscript

@@ -2,23 +2,11 @@ import os
 from building import *
 
 cwd = GetCurrentDir()
+src = ['board.c']
+path = [cwd]
 
-# add the general drivers.
-src = Glob('board.c')
-pkg_root = os.path.join(cwd, '..', 'packages', 'novosns-series', 'NS800RT7XXX')
-path = [
-    cwd,
-    os.path.join(pkg_root, 'Device', 'Inc'),
-    os.path.join(pkg_root, 'StdDriver', 'Inc'),
-    os.path.join(pkg_root, 'StdDriver', 'Inc', 'ti'),
-    os.path.join(cwd, '..', 'libraries', 'HAL_Drivers'),
-    os.path.join(cwd, '..', 'libraries', 'HAL_Drivers', 'drivers'),
-]
-
-group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path)
-list = os.listdir(cwd)
-for item in list:
-    if os.path.isfile(os.path.join(cwd, item, 'SConscript')):
-        group = group + SConscript(os.path.join(item, 'SConscript'))
+cppdefines = ['NS800RT7P65X', 'USE_HAL_DRIVER', 'DUAL_CORE_ENABLE=0', 
+        'SYSCLK_USE_PLL', 'SYSCLK_SOURCE_USE_HXTL', 'PLLCLK_SOURCE_USE_HXTL']
 
+group = DefineGroup('Board', src, depend = [''], CPPPATH = path, CPPDEFINES = cppdefines)
 Return('group')

bsp/novosns/ns800/ns800rt7p65-nssinepad/board/board.c

@@ -138,7 +138,7 @@ void Switch_init (void)
 void Device_init(void)
 {
     System_setClock();
-#ifndef RT_USING_SMP
+#if (DUAL_CORE_ENABLE == 0)
     Device_enableAllPeripheralsInCpu1();
 #endif
     Device_enableAllPeripherals();