feat : n32g452xx direct structure base at32

1. 重新整理目录结构

bsp/n32g452xx/Libraries/N32_Std_Driver/SConscript

+import rtconfig
+from building import *
+
+# get current directory
+cwd = GetCurrentDir()
+
+# The set of source files associated with this SConscript file.
+# src = Split("""
+# n32g45x_std_periph_driver/src/misc.c
+# n32g45x_std_periph_driver/src/n32g45x_adc.c
+# n32g45x_std_periph_driver/src/n32g45x_bkp.c
+# n32g45x_std_periph_driver/src/n32g45x_can.c
+# n32g45x_std_periph_driver/src/n32g45x_comp.c
+# n32g45x_std_periph_driver/src/n32g45x_crc.c
+# n32g45x_std_periph_driver/src/n32g45x_dac.c
+# n32g45x_std_periph_driver/src/n32g45x_dbg.c
+# n32g45x_std_periph_driver/src/n32g45x_dma.c
+# n32g45x_std_periph_driver/src/n32g45x_dvp.c
+# n32g45x_std_periph_driver/src/n32g45x_eth.c
+# n32g45x_std_periph_driver/src/n32g45x_exti.c
+# n32g45x_std_periph_driver/src/n32g45x_flash.c
+# n32g45x_std_periph_driver/src/n32g45x_gpio.c
+# n32g45x_std_periph_driver/src/n32g45x_i2c.c
+# n32g45x_std_periph_driver/src/n32g45x_iwdg.c
+# n32g45x_std_periph_driver/src/n32g45x_opamp.c
+# n32g45x_std_periph_driver/src/n32g45x_pwr.c
+# n32g45x_std_periph_driver/src/n32g45x_qspi.c
+# n32g45x_std_periph_driver/src/n32g45x_rcc.c
+# n32g45x_std_periph_driver/src/n32g45x_rtc.c
+# n32g45x_std_periph_driver/src/n32g45x_sdio.c
+# n32g45x_std_periph_driver/src/n32g45x_spi.c
+# n32g45x_std_periph_driver/src/n32g45x_tim.c
+# n32g45x_std_periph_driver/src/n32g45x_tsc.c
+# n32g45x_std_periph_driver/src/n32g45x_usart.c
+# n32g45x_std_periph_driver/src/n32g45x_wwdg.c
+# n32g45x_std_periph_driver/src/n32g45x_xfmc.c
+# """)
+src = Glob('n32g45x_std_periph_driver/src/*.c')
+src += [cwd + '/CMSIS/device/system_n32g45x.c']
+
+path = [
+    cwd + '/CMSIS/core',
+    cwd + '/CMSIS/device',
+    cwd + '/n32g45x_std_periph_driver/inc',]
+
+if GetDepend(['RT_USING_BSP_USB']):
+    path += [cwd + '/n32g45x_usbfs_driver/inc']
+    src  += [cwd + '/n32g45x_usbfs_driver/src']
+
+CPPDEFINES = ['USE_STDPERIPH_DRIVER']
+
+group = DefineGroup('Libraries', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES)
+
+Return('group')

bsp/n32g452xx/Libraries/SConscript

-import rtconfig
-Import('RTT_ROOT')
-from building import *
-
-# get current directory
-cwd = GetCurrentDir()
-
-# The set of source files associated with this SConscript file.
-
-src = Glob('n32g45x_std_periph_driver/src/*.c')
-src += [cwd + '/CMSIS/device/system_n32g45x.c']
-
-#add for startup script
-if rtconfig.CROSS_TOOL == 'gcc':
-    src += [cwd + '/CMSIS/device/startup/startup_n32g45x_gcc.S']
-elif rtconfig.CROSS_TOOL == 'keil':
-    src += [cwd + '/CMSIS/device/startup/startup_n32g45x.s']
-elif rtconfig.CROSS_TOOL == 'iar':
-    src += [cwd + '/CMSIS/device/startup/startup_n32g45x_EWARM.s']
-
-path = [
-    cwd + '/CMSIS/core',
-    cwd + '/CMSIS/device',
-    cwd + '/n32g45x_std_periph_driver/inc',]
-    
-if GetDepend(['RT_USING_BSP_USB']):
-    path += [cwd + '/n32g45x_usbfs_driver/inc']
-    src  += [cwd + '/n32g45x_usbfs_driver/src']
-
-CPPDEFINES = ['USE_STDPERIPH_DRIVER', 'N32G45X']
-
-group = DefineGroup('N32_Lib', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES)
-
-#print('CROSS_TOOL=[%s]' %(rtconfig.CROSS_TOOL))
-#print('path=[%s]' %(path))
-
-Return('group')

bsp/n32g452xx/Libraries/rt_drivers/SConscript

+# RT-Thread building script for component
+Import('RTT_ROOT')
+Import('rtconfig')
+from building import *
+
+cwd = GetCurrentDir()
+
+# add the general drivers.
+src = Split("""
+""")
+
+src += ['drv_common.c']
+
+if GetDepend(['RT_USING_PIN']):
+    src += ['drv_gpio.c']
+
+if GetDepend(['RT_USING_WDT']):
+    src += ['drv_wdt.c']
+
+if GetDepend(['RT_USING_SERIAL']):
+    src += ['drv_usart.c']
+
+if GetDepend(['RT_USING_PWM']):
+    src += ['drv_pwm.c']
+
+if GetDepend(['RT_USING_HWTIMER']):
+    src += ['drv_hwtimer.c']
+
+if GetDepend(['RT_USING_SPI']):
+    src += ['drv_spi.c']
+
+if GetDepend(['RT_USING_ETH', 'RT_USING_LWIP']):
+    src += ['drv_eth.c']
+
+if GetDepend(['RT_USING_I2C', 'RT_USING_I2C_BITOPS']):
+    if GetDepend('RT_USING_I2C1') or GetDepend('RT_USING_I2C2') or GetDepend('RT_USING_I2C3') or GetDepend('RT_USING_I2C4'):
+        src += ['drv_soft_i2c.c']
+
+if GetDepend(['RT_USING_ADC']):
+    src += Glob('drv_adc.c')
+
+if GetDepend('RT_USING_SRAM'):
+    src += ['drv_sram.c']
+
+if GetDepend('RT_USING_RTC'):
+    src += ['drv_rtc.c']
+
+if GetDepend('RT_USING_ON_CHIP_FLASH'):
+    src += ['drv_flash.c']
+
+if GetDepend(['RT_USING_WDT']):
+    src += ['drv_wdt.c']
+
+if GetDepend(['RT_USING_CAN']):
+    src += ['drv_can.c']
+
+if GetDepend(['RT_USING_SDIO']):
+    src += ['drv_sdio.c']
+
+CPPPATH = [cwd]
+
+group = DefineGroup('Drivers', src, depend = [''], CPPPATH = CPPPATH)
+
+Return('group')

bsp/n32g452xx/Libraries/rt_drivers/drv_common.c

+/*
+ * Copyright (c) 2006-2021, RT-Thread Development Team
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Change Logs:
+ * Date           Author       Notes
+ * 2018-11-7      SummerGift   first version
+ */
+
+#include "drv_common.h"
+#include "board.h"
+
+#ifdef RT_USING_SERIAL
+#ifdef RT_USING_SERIAL_V2
+#include "drv_usart_v2.h"
+#else
+#include "drv_usart.h"
+#endif
+#endif
+
+#ifdef RT_USING_FINSH
+#include <finsh.h>
+static void reboot(uint8_t argc, char **argv)
+{
+    rt_hw_cpu_reset();
+}
+FINSH_FUNCTION_EXPORT_ALIAS(reboot, __cmd_reboot, Reboot System);
+#endif /* RT_USING_FINSH */
+
+/**
+ * This function will delay for some us.
+ *
+ * @param us the delay time of us
+ */
+void rt_hw_us_delay(rt_uint32_t us)
+{
+    rt_uint32_t ticks;
+    rt_uint32_t told, tnow, tcnt = 0;
+    rt_uint32_t reload = SysTick->LOAD;
+
+    ticks = us * reload / (1000000 / RT_TICK_PER_SECOND);
+    told = SysTick->VAL;
+    while (1)
+    {
+        tnow = SysTick->VAL;
+        if (tnow != told)
+        {
+            if (tnow < told)
+            {
+                tcnt += told - tnow;
+            }
+            else
+            {
+                tcnt += reload - tnow + told;
+            }
+            told = tnow;
+            if (tcnt >= ticks)
+            {
+                break;
+            }
+        }
+    }
+}

bsp/n32g452xx/Libraries/rt_drivers/drv_common.h

+/*
+ * Copyright (c) 2006-2021, RT-Thread Development Team
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Change Logs:
+ * Date           Author       Notes
+ * 2018-11-7      SummerGift   first version
+ */
+
+#ifndef __DRV_COMMON_H__
+#define __DRV_COMMON_H__
+
+#include <rtthread.h>
+#include <rthw.h>
+#ifdef RT_USING_DEVICE
+#include <rtdevice.h>
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+void rt_hw_us_delay(rt_uint32_t us);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif

bsp/n32g452xx/drivers/drv_gpio.c → bsp/n32g452xx/Libraries/rt_drivers/drv_gpio.c

@@ -15,7 +15,7 @@
 
 #ifdef RT_USING_PIN
 
-#define N32F10X_PIN_NUMBERS 100 //[48, 64, 100, 144 ]
+#define N32F10X_PIN_NUMBERS 64 //[48, 64, 100, 144 ]
 
 #define __N32_PIN(index, rcc, gpio, gpio_index) \
 { \

bsp/n32g452xx/drivers/SConscript

-Import('RTT_ROOT')
-Import('rtconfig')
-from building import *
-
-cwd = os.path.join(str(Dir('#')), 'drivers')
-
-# add the general drivers.
-src = Split("""
-board.c
-drv_gpio.c
-drv_usart.c
-""")
-
-CPPPATH = [cwd]
-
-# add spi drivers.
-#if GetDepend('RT_USING_SPI'):
-#    src += ['drv_spi.c']
-    
-# add i2c drivers.
-#if GetDepend('RT_USING_I2C'):
-#    src += ['drv_i2c.c']
-
-# add spi flash drivers.
-#if GetDepend('RT_USING_SFUD'):
-#    src += ['drv_spi_flash.c']
-
-group = DefineGroup('Drivers', src, depend = [''], CPPPATH = CPPPATH)
-
-Return('group')

bsp/n32g452xx/.config → bsp/n32g452xx/n32g452xx-mini-system/.config

@@ -8,6 +8,7 @@
 #
 CONFIG_RT_NAME_MAX=8
 # CONFIG_RT_USING_ARCH_DATA_TYPE is not set
+# CONFIG_RT_USING_SMP is not set
 CONFIG_RT_ALIGN_SIZE=4
 # CONFIG_RT_THREAD_PRIORITY_8 is not set
 CONFIG_RT_THREAD_PRIORITY_32=y
@@ -22,6 +23,12 @@ CONFIG_IDLE_THREAD_STACK_SIZE=256
 CONFIG_RT_USING_TIMER_SOFT=y
 CONFIG_RT_TIMER_THREAD_PRIO=4
 CONFIG_RT_TIMER_THREAD_STACK_SIZE=512
+
+#
+# kservice optimization
+#
+# CONFIG_RT_KSERVICE_USING_STDLIB is not set
+# CONFIG_RT_KSERVICE_USING_TINY_SIZE is not set
 CONFIG_RT_DEBUG=y
 # CONFIG_RT_DEBUG_COLOR is not set
 # CONFIG_RT_DEBUG_INIT_CONFIG is not set
@@ -53,6 +60,7 @@ CONFIG_RT_USING_MEMPOOL=y
 # CONFIG_RT_USING_NOHEAP is not set
 CONFIG_RT_USING_SMALL_MEM=y
 # CONFIG_RT_USING_SLAB is not set
+# CONFIG_RT_USING_USERHEAP is not set
 # CONFIG_RT_USING_MEMTRACE is not set
 CONFIG_RT_USING_HEAP=y
 
@@ -65,7 +73,8 @@ CONFIG_RT_USING_DEVICE=y
 CONFIG_RT_USING_CONSOLE=y
 CONFIG_RT_CONSOLEBUF_SIZE=128
 CONFIG_RT_CONSOLE_DEVICE_NAME="uart1"
-CONFIG_RT_VER_NUM=0x30105
+# CONFIG_RT_PRINTF_LONGLONG is not set
+CONFIG_RT_VER_NUM=0x40004
 # CONFIG_RT_USING_CPU_FFS is not set
 # CONFIG_ARCH_CPU_STACK_GROWS_UPWARD is not set
 
@@ -104,7 +113,16 @@ CONFIG_FINSH_ARG_MAX=10
 #
 # Device virtual file system
 #
-# CONFIG_RT_USING_DFS is not set
+CONFIG_RT_USING_DFS=y
+CONFIG_DFS_USING_WORKDIR=y
+CONFIG_DFS_FILESYSTEMS_MAX=4
+CONFIG_DFS_FILESYSTEM_TYPES_MAX=4
+CONFIG_DFS_FD_MAX=16
+# CONFIG_RT_USING_DFS_MNTTABLE is not set
+# CONFIG_RT_USING_DFS_ELMFAT is not set
+CONFIG_RT_USING_DFS_DEVFS=y
+# CONFIG_RT_USING_DFS_ROMFS is not set
+# CONFIG_RT_USING_DFS_RAMFS is not set
 
 #
 # Device Drivers
@@ -113,14 +131,18 @@ CONFIG_RT_USING_DEVICE_IPC=y
 CONFIG_RT_PIPE_BUFSZ=512
 # CONFIG_RT_USING_SYSTEM_WORKQUEUE is not set
 CONFIG_RT_USING_SERIAL=y
+CONFIG_RT_USING_SERIAL_V1=y
+# CONFIG_RT_USING_SERIAL_V2 is not set
 CONFIG_RT_SERIAL_USING_DMA=y
 CONFIG_RT_SERIAL_RB_BUFSZ=64
 # CONFIG_RT_USING_CAN is not set
 # CONFIG_RT_USING_HWTIMER is not set
 # CONFIG_RT_USING_CPUTIME is not set
 # CONFIG_RT_USING_I2C is not set
+# CONFIG_RT_USING_PHY is not set
 CONFIG_RT_USING_PIN=y
 # CONFIG_RT_USING_ADC is not set
+# CONFIG_RT_USING_DAC is not set
 # CONFIG_RT_USING_PWM is not set
 # CONFIG_RT_USING_MTD_NOR is not set
 # CONFIG_RT_USING_MTD_NAND is not set
@@ -148,7 +170,13 @@ CONFIG_RT_USING_PIN=y
 #
 CONFIG_RT_USING_LIBC=y
 # CONFIG_RT_USING_PTHREADS is not set
+CONFIG_RT_USING_POSIX=y
+# CONFIG_RT_USING_POSIX_MMAP is not set
+# CONFIG_RT_USING_POSIX_TERMIOS is not set
+# CONFIG_RT_USING_POSIX_GETLINE is not set
+# CONFIG_RT_USING_POSIX_AIO is not set
 # CONFIG_RT_USING_MODULE is not set
+CONFIG_RT_LIBC_FIXED_TIMEZONE=8
 
 #
 # Network
@@ -185,6 +213,12 @@ CONFIG_RT_USING_LIBC=y
 # CONFIG_RT_USING_RYM is not set
 # CONFIG_RT_USING_ULOG is not set
 # CONFIG_RT_USING_UTEST is not set
+# CONFIG_RT_USING_RT_LINK is not set
+
+#
+# RT-Thread Utestcases
+#
+# CONFIG_RT_USING_UTESTCASES is not set
 
 #
 # RT-Thread online packages
@@ -233,6 +267,7 @@ CONFIG_RT_USING_LIBC=y
 # CONFIG_PKG_USING_AT_DEVICE is not set
 # CONFIG_PKG_USING_ATSRV_SOCKET is not set
 # CONFIG_PKG_USING_WIZNET is not set
+# CONFIG_PKG_USING_ZB_COORDINATOR is not set
 
 #
 # IoT Cloud
@@ -273,6 +308,7 @@ CONFIG_RT_USING_LIBC=y
 # CONFIG_PKG_USING_AGILE_MODBUS is not set
 # CONFIG_PKG_USING_AGILE_FTP is not set
 # CONFIG_PKG_USING_EMBEDDEDPROTO is not set
+# CONFIG_PKG_USING_RT_LINK_HW is not set
 
 #
 # security packages
@@ -469,6 +505,7 @@ CONFIG_RT_USING_LIBC=y
 # CONFIG_PKG_USING_KOBUKI is not set
 # CONFIG_PKG_USING_ROSSERIAL is not set
 # CONFIG_PKG_USING_MICRO_ROS is not set
+# CONFIG_PKG_USING_MCP23008 is not set
 
 #
 # AI packages
@@ -532,8 +569,22 @@ CONFIG_RT_USING_LIBC=y
 # CONFIG_PKG_USING_STATE_MACHINE is not set
 # CONFIG_PKG_USING_MCURSES is not set
 # CONFIG_PKG_USING_COWSAY is not set
+
+#
+# Hardware Drivers Config
+#
 CONFIG_SOC_N32G452XX=y
+
+#
+# Onboard Peripheral Drivers
+#
+
+#
+# On-chip Peripheral Drivers
+#
+CONFIG_RT_USING_GPIO=y
+# CONFIG_RT_USING_ON_CHIP_FLASH is not set
+CONFIG_RT_USING_UART=y
 CONFIG_RT_USING_UART1=y
 # CONFIG_RT_USING_UART2 is not set
 # CONFIG_RT_USING_UART3 is not set
-# CONFIG_RT_USING_UART4 is not set

bsp/n32g452xx/Kconfig → bsp/n32g452xx/n32g452xx-mini-system/Kconfig

@@ -8,7 +8,7 @@ config BSP_DIR
 config RTT_DIR
     string
     option env="RTT_ROOT"
-    default "../.."
+    default "../../.."
 
 config PKGS_DIR
     string
@@ -17,31 +17,4 @@ config PKGS_DIR
 
 source "$RTT_DIR/Kconfig"
 source "$PKGS_DIR/Kconfig"
-
-config SOC_N32G452XX
-    bool 
-    select RT_USING_COMPONENTS_INIT
-    select RT_USING_USER_MAIN
-    default y
-    
-config RT_USING_UART1
-    bool "Using UART1"
-    select RT_USING_SERIAL
-    default y
-
-config RT_USING_UART2
-    bool "Using UART2"
-    select RT_USING_SERIAL
-    default n
-
-config RT_USING_UART3
-    bool "Using UART3"
-    select RT_USING_SERIAL
-    default n
-    
-config RT_USING_UART4
-    bool "Using UART4"
-    select RT_USING_SERIAL
-    default n
-
-
+source "board/Kconfig"

bsp/n32g452xx/SConscript → bsp/n32g452xx/n32g452xx-mini-system/SConscript

 # for module compiling
 import os
 Import('RTT_ROOT')
+from building import *
 
-cwd = str(Dir('#'))
+cwd = GetCurrentDir()
 objs = []
 list = os.listdir(cwd)
 

bsp/n32g452xx/SConstruct → bsp/n32g452xx/n32g452xx-mini-system/SConstruct

@@ -5,7 +5,7 @@ import rtconfig
 if os.getenv('RTT_ROOT'):
     RTT_ROOT = os.getenv('RTT_ROOT')
 else:
-    RTT_ROOT = os.path.normpath(os.getcwd() + '/../..')
+    RTT_ROOT = os.path.normpath(os.getcwd() + '/../../..')
 
 sys.path = sys.path + [os.path.join(RTT_ROOT, 'tools')]
 try:
@@ -15,7 +15,7 @@ except:
     print(RTT_ROOT)
     exit(-1)
 
-TARGET = 'rt-thread.' + rtconfig.TARGET_EXT
+TARGET = 'rtthread.' + rtconfig.TARGET_EXT
 
 DefaultEnvironment(tools=[])
 env = Environment(tools = ['mingw'],
@@ -28,15 +28,35 @@ env.PrependENVPath('PATH', rtconfig.EXEC_PATH)
 if rtconfig.PLATFORM == 'iar':
     env.Replace(CCCOM = ['$CC $CCFLAGS $CPPFLAGS $_CPPDEFFLAGS $_CPPINCFLAGS -o $TARGET $SOURCES'])
     env.Replace(ARFLAGS = [''])
-    env.Replace(LINKCOM = env["LINKCOM"] + ' --map rt-thread.map')
+    env.Replace(LINKCOM = env["LINKCOM"] + ' --map project.map')
 
 Export('RTT_ROOT')
 Export('rtconfig')
 
-print('RTT_ROOT=[%s], TARGET=[%s]' %(RTT_ROOT, TARGET))
+SDK_ROOT = os.path.abspath('./')
+print('SDK_ROOT=[%s]' %(SDK_ROOT))
+
+if os.path.exists(SDK_ROOT + '/Libraries'):
+    libraries_path_prefix = SDK_ROOT + '/Libraries'
+else:
+    libraries_path_prefix = os.path.dirname(SDK_ROOT) + '/Libraries'
+print('libraries_path_prefix=[%s]' %(libraries_path_prefix))
+
+SDK_LIB = libraries_path_prefix
+Export('SDK_LIB')
+print('SDK_LIB=[%s]' %(SDK_LIB))
 
 # prepare building environment
 objs = PrepareBuilding(env, RTT_ROOT, has_libcpu=False)
 
+n32_library = 'N32_Std_Driver'
+rtconfig.BSP_LIBRARY_TYPE = n32_library
+
+# include libraries
+objs.extend(SConscript(os.path.join(libraries_path_prefix, n32_library, 'SConscript')))
+
+# common include drivers
+objs.extend(SConscript(os.path.join(libraries_path_prefix, 'rt_drivers', 'SConscript')))
+
 # make a building
 DoBuilding(TARGET, objs)

bsp/n32g452xx/applications/SConscript → bsp/n32g452xx/n32g452xx-mini-system/applications/SConscript

@@ -2,7 +2,7 @@ Import('RTT_ROOT')
 Import('rtconfig')
 from building import *
 
-cwd     = os.path.join(str(Dir('#')), 'applications')
+cwd = os.path.join(str(Dir('#')), 'applications')
 src	= Glob('*.c')
 CPPPATH = [cwd, str(Dir('#'))]
 

bsp/n32g452xx/n32g452xx-mini-system/board/Kconfig

+menu "Hardware Drivers Config"
+
+config SOC_N32G452XX
+    bool
+    select RT_USING_COMPONENTS_INIT
+    select RT_USING_USER_MAIN
+    default y
+
+menu "Onboard Peripheral Drivers"
+
+    config RT_USING_SERIAL
+        bool "Enable USART (uart1)"
+        select RT_USING_UART
+        select RT_USING_UART1
+        default y
+
+endmenu
+
+menu "On-chip Peripheral Drivers"
+
+    config RT_USING_GPIO
+        bool "Enable GPIO"
+        select RT_USING_PIN
+        default y
+
+    config RT_USING_ON_CHIP_FLASH
+        bool "Enable on-chip FLASH"
+        default n 
+
+    menuconfig RT_USING_UART
+        bool "Enable UART"
+        default y
+        select RT_USING_SERIAL
+        if RT_USING_UART
+            config RT_USING_UART1
+                bool "Enable UART1"
+                default y
+
+            config RT_USING_UART2
+                bool "Enable UART2"
+                default n
+
+            config RT_USING_UART3
+                bool "Enable UART3"
+                default n
+        endif
+endmenu
+
+endmenu

bsp/n32g452xx/n32g452xx-mini-system/board/SConscript

+import os
+import rtconfig
+from building import *
+
+Import('SDK_LIB')
+
+cwd = GetCurrentDir()
+
+# add general drivers
+src = Split('''
+board.c
+''')
+
+path = [cwd]
+
+startup_path_prefix = SDK_LIB
+
+if rtconfig.CROSS_TOOL == 'gcc':
+    src += [startup_path_prefix + '/N32_Std_Driver/CMSIS/device/startup/startup_n32g45x_gcc.S']
+elif rtconfig.CROSS_TOOL == 'keil':
+    src += [startup_path_prefix + '/N32_Std_Driver/CMSIS/device/startup/startup_n32g45x.s']
+
+CPPDEFINES = ['N32G45X']
+group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES)
+Return('group')

bsp/n32g452xx/rtconfig.h → bsp/n32g452xx/n32g452xx-mini-system/rtconfig.h

@@ -19,6 +19,9 @@
 #define RT_USING_TIMER_SOFT
 #define RT_TIMER_THREAD_PRIO 4
 #define RT_TIMER_THREAD_STACK_SIZE 512
+
+/* kservice optimization */
+
 #define RT_DEBUG
 
 /* Inter-Thread communication */
@@ -41,7 +44,7 @@
 #define RT_USING_CONSOLE
 #define RT_CONSOLEBUF_SIZE 128
 #define RT_CONSOLE_DEVICE_NAME "uart1"
-#define RT_VER_NUM 0x30105
+#define RT_VER_NUM 0x40004
 
 /* RT-Thread Components */
 
@@ -70,12 +73,19 @@
 
 /* Device virtual file system */
 
+#define RT_USING_DFS
+#define DFS_USING_WORKDIR
+#define DFS_FILESYSTEMS_MAX 4
+#define DFS_FILESYSTEM_TYPES_MAX 4
+#define DFS_FD_MAX 16
+#define RT_USING_DFS_DEVFS
 
 /* Device Drivers */
 
 #define RT_USING_DEVICE_IPC
 #define RT_PIPE_BUFSZ 512
 #define RT_USING_SERIAL
+#define RT_USING_SERIAL_V1
 #define RT_SERIAL_USING_DMA
 #define RT_SERIAL_RB_BUFSZ 64
 #define RT_USING_PIN
@@ -86,6 +96,8 @@
 /* POSIX layer and C standard library */
 
 #define RT_USING_LIBC
+#define RT_USING_POSIX
+#define RT_LIBC_FIXED_TIMEZONE 8
 
 /* Network */
 
@@ -107,6 +119,9 @@
 /* Utilities */
 
 
+/* RT-Thread Utestcases */
+
+
 /* RT-Thread online packages */
 
 /* IoT - internet of things */
@@ -157,7 +172,17 @@
 
 /* entertainment: terminal games and other interesting software packages */
 
+
+/* Hardware Drivers Config */
+
 #define SOC_N32G452XX
+
+/* Onboard Peripheral Drivers */
+
+/* On-chip Peripheral Drivers */
+
+#define RT_USING_GPIO
+#define RT_USING_UART
 #define RT_USING_UART1
 
 #endif

bsp/n32g452xx/rtconfig.py → bsp/n32g452xx/n32g452xx-mini-system/rtconfig.py

 import os
 
+print(os.path.abspath(__file__))
+
 # toolchains options
 ARCH='arm'
 CPU='cortex-m4'
 CROSS_TOOL='keil'
 
+# bsp lib config
+BSP_LIBRARY_TYPE = None
+
+if os.getenv('RTT_CC'):
+    CROSS_TOOL = os.getenv('RTT_CC')
+if os.getenv('RTT_ROOT'):
+    RTT_ROOT = os.getenv('RTT_ROOT')
+else:
+    RTT_ROOT = os.path.normpath(os.getcwd() + '/../../..')
+
 # cross_tool provides the cross compiler
 # EXEC_PATH is the compiler execute path, for example, CodeSourcery, Keil MDK, IAR
 if  CROSS_TOOL == 'gcc':
     PLATFORM    = 'gcc'
     EXEC_PATH   = r'/opt/gcc-arm-none-eabi-6_2-2016q4/bin'
 elif CROSS_TOOL == 'keil':
-    PLATFORM 	= 'armcc'
-    EXEC_PATH 	= r'C:/Keil_v5'
+    PLATFORM    = 'armcc'
+    EXEC_PATH   = r'C:/Keil_v5'
 elif CROSS_TOOL == 'iar':
-    PLATFORM 	= 'iar'
-    EXEC_PATH 	= r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0'
+    PLATFORM    = 'iar'
+    EXEC_PATH   = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0'
 
 if os.getenv('RTT_EXEC_PATH'):
-	EXEC_PATH = os.getenv('RTT_EXEC_PATH')
+    EXEC_PATH = os.getenv('RTT_EXEC_PATH')
 
 BUILD = 'debug'
 
 if PLATFORM == 'gcc':
-    # tool-chains
+    # toolchains
     PREFIX = 'arm-none-eabi-'
     CC = PREFIX + 'gcc'
     AS = PREFIX + 'gcc'
     AR = PREFIX + 'ar'
+    CXX = PREFIX + 'g++'
     LINK = PREFIX + 'gcc'
     TARGET_EXT = 'elf'
     SIZE = PREFIX + 'size'
     OBJDUMP = PREFIX + 'objdump'
     OBJCPY = PREFIX + 'objcopy'
-	
-    DEVICE = ' -mcpu=cortex-m4 -mthumb -ffunction-sections -fdata-sections'
-    CFLAGS = DEVICE + ' -Dgcc' # -D' + PART_TYPE
+
+    DEVICE = ' -mcpu=cortex-m4 -mthumb -mfpu=fpv4-sp-d16 -mfloat-abi=hard -ffunction-sections -fdata-sections'
+    CFLAGS = DEVICE + ' -Dgcc'
     AFLAGS = ' -c' + DEVICE + ' -x assembler-with-cpp -Wa,-mimplicit-it=thumb '
-    LFLAGS = DEVICE + ' -Wl,--gc-sections,-Map=rtthread.map,-cref,-u,Reset_Handler -T n32_rom.lds'
+    LFLAGS = DEVICE + ' -Wl,--gc-sections,-Map=rt-thread.map,-cref,-u,Reset_Handler -T board/linker_scripts/link.lds'
 
     CPATH = ''
     LPATH = ''
@@ -48,27 +61,30 @@ if PLATFORM == 'gcc':
     else:
         CFLAGS += ' -O2'
 
+    CXXFLAGS = CFLAGS
+
     POST_ACTION = OBJCPY + ' -O binary $TARGET rtthread.bin\n' + SIZE + ' $TARGET \n'
 
 elif PLATFORM == 'armcc':
     # toolchains
     CC = 'armcc'
+    CXX = 'armcc'
     AS = 'armasm'
     AR = 'armar'
     LINK = 'armlink'
     TARGET_EXT = 'axf'
 
-    DEVICE = ' --cpu Cortex-M4'
-    CFLAGS = DEVICE + ' --apcs=interwork'
-    AFLAGS = DEVICE
-    LFLAGS = DEVICE + ' --info sizes --info totals --info unused --info veneers --list rtthread.map --scatter n32_rom.sct'
-
-    LFLAGS += ' --keep *.o(.rti_fn.*)   --keep *.o(FSymTab) --keep *.o(VSymTab)' 
-
-    EXEC_PATH += '/ARM/ARMCC/bin'
-    print(EXEC_PATH)
+    DEVICE = ' --cpu Cortex-M4.fp '
+    CFLAGS = '-c ' + DEVICE + ' --apcs=interwork --c99'
+    AFLAGS = DEVICE + ' --apcs=interwork '
+    LFLAGS = DEVICE + ' --scatter "board\linker_scripts\link.sct" --info sizes --info totals --info unused --info veneers --list rt-thread.map --strict'
+    CFLAGS += ' -I' + EXEC_PATH + '/ARM/ARMCC/include'
+    LFLAGS += ' --libpath=' + EXEC_PATH + '/ARM/ARMCC/lib'
 
-    CFLAGS += ' --c99'
+    CFLAGS += ' -D__MICROLIB '
+    AFLAGS += ' --pd "__MICROLIB SETA 1" '
+    LFLAGS += ' --library_type=microlib '
+    EXEC_PATH += '/ARM/ARMCC/bin/'
 
     if BUILD == 'debug':
         CFLAGS += ' -g -O0'
@@ -76,17 +92,21 @@ elif PLATFORM == 'armcc':
     else:
         CFLAGS += ' -O2'
 
+    CXXFLAGS = CFLAGS
+    CFLAGS += ' -std=c99'
+
     POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET'
 
 elif PLATFORM == 'iar':
     # toolchains
     CC = 'iccarm'
+    CXX = 'iccarm'
     AS = 'iasmarm'
     AR = 'iarchive'
     LINK = 'ilinkarm'
     TARGET_EXT = 'out'
 
-    DEVICE = ' -D USE_STDPERIPH_DRIVER' + ' -D N32G45X'
+    DEVICE = '-Dewarm'
 
     CFLAGS = DEVICE
     CFLAGS += ' --diag_suppress Pa050'
@@ -97,42 +117,54 @@ elif PLATFORM == 'iar':
     CFLAGS += ' --no_tbaa'
     CFLAGS += ' --no_clustering'
     CFLAGS += ' --no_scheduling'
-    CFLAGS += ' --debug'
     CFLAGS += ' --endian=little'
     CFLAGS += ' --cpu=Cortex-M4'
     CFLAGS += ' -e'
-    CFLAGS += ' --fpu=None'
+    CFLAGS += ' --fpu=VFPv4_sp'
     CFLAGS += ' --dlib_config "' + EXEC_PATH + '/arm/INC/c/DLib_Config_Normal.h"'
-    CFLAGS += ' -Ol'
-    CFLAGS += ' --use_c++_inline'
+    CFLAGS += ' --silent'
 
-    AFLAGS = ''
+    AFLAGS = DEVICE
     AFLAGS += ' -s+'
     AFLAGS += ' -w+'
     AFLAGS += ' -r'
     AFLAGS += ' --cpu Cortex-M4'
-    AFLAGS += ' --fpu None'
+    AFLAGS += ' --fpu VFPv4_sp'
+    AFLAGS += ' -S'
+
+    if BUILD == 'debug':
+        CFLAGS += ' --debug'
+        CFLAGS += ' -On'
+    else:
+        CFLAGS += ' -Oh'
 
-    LFLAGS = ' --config n32_rom.icf'
-    LFLAGS += ' --redirect _Printf=_PrintfTiny'
-    LFLAGS += ' --redirect _Scanf=_ScanfSmall'
+    LFLAGS = ' --config "board/linker_scripts/link.icf"'
     LFLAGS += ' --entry __iar_program_start'
 
-    EXEC_PATH += '/arm/bin/'
-    POST_ACTION = ''
-
-#print('ARCH       =[%s]' %(ARCH      ))  
-#print('CPU        =[%s]' %(CPU       ))
-#print('CROSS_TOOL =[%s]' %(CROSS_TOOL))
-#print('RTT_ROOT   =[%s]' %(RTT_ROOT  ))
-#print('PLATFORM   =[%s]' %(PLATFORM  ))
-#print('EXEC_PATH  =[%s]' %(EXEC_PATH ))
-#print('CC         =[%s]' %(CC        ))
-#print('AS         =[%s]' %(AS        ))
-#print('AR         =[%s]' %(AR        ))
-#print('LINK       =[%s]' %(LINK      ))
-#print('TARGET_EXT =[%s]' %(TARGET_EXT))
-#print('DEVICE     =[%s]' %(DEVICE    ))
-#print('CFLAGS     =[%s]' %(CFLAGS    ))
-#print('AFLAGS     =[%s]' %(AFLAGS    ))
-#print('LFLAGS     =[%s]' %(LFLAGS    ))
+    CXXFLAGS = CFLAGS
+
+    EXEC_PATH = EXEC_PATH + '/arm/bin/'
+    POST_ACTION = 'ielftool --bin $TARGET rtthread.bin'
+
+def dist_handle(BSP_ROOT, dist_dir):
+    import sys
+    cwd_path = os.getcwd()
+    sys.path.append(os.path.join(os.path.dirname(BSP_ROOT), 'tools'))
+    from sdk_dist import dist_do_building
+    dist_do_building(BSP_ROOT, dist_dir)
+    
+print('ARCH       =[%s]' %(ARCH      ))
+print('CPU        =[%s]' %(CPU       ))
+print('CROSS_TOOL =[%s]' %(CROSS_TOOL))
+print('RTT_ROOT   =[%s]' %(RTT_ROOT  ))
+print('PLATFORM   =[%s]' %(PLATFORM  ))
+print('EXEC_PATH  =[%s]' %(EXEC_PATH ))
+print('CC         =[%s]' %(CC        ))
+print('AS         =[%s]' %(AS        ))
+print('AR         =[%s]' %(AR        ))
+print('LINK       =[%s]' %(LINK      ))
+print('TARGET_EXT =[%s]' %(TARGET_EXT))
+print('DEVICE     =[%s]' %(DEVICE    ))
+print('CFLAGS     =[%s]' %(CFLAGS    ))
+print('AFLAGS     =[%s]' %(AFLAGS    ))
+print('LFLAGS     =[%s]' %(LFLAGS    ))

bsp/n32g452xx/template.uvprojx → bsp/n32g452xx/n32g452xx-mini-system/template.uvprojx

@@ -369,7 +369,7 @@
             <TextAddressRange>0x08000000</TextAddressRange>
             <DataAddressRange>0x20000000</DataAddressRange>
             <pXoBase></pXoBase>
-            <ScatterFile>.\n32_rom.sct</ScatterFile>
+            <ScatterFile>.\board\linker_scripts\link.sct</ScatterFile>
             <IncludeLibs></IncludeLibs>
             <IncludeLibsPath></IncludeLibsPath>
             <Misc></Misc>

bsp/n32g452xx/startcmd.bat

-start cmd.exe
\ No newline at end of file

bsp/n32g452xx/tools/sdk_dist.py

+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 n32 bsp library")
+    library_dir = os.path.join(dist_dir, 'Libraries')
+    library_path = os.path.join(os.path.dirname(BSP_ROOT), 'Libraries')
+    bsp_copy_files(os.path.join(library_path, rtconfig.BSP_LIBRARY_TYPE),
+                   os.path.join(library_dir, rtconfig.BSP_LIBRARY_TYPE))
+
+    print("=> copy bsp drivers")
+    bsp_copy_files(os.path.join(library_path, 'rt_drivers'), os.path.join(library_dir, 'rt_drivers'))
+    shutil.copyfile(os.path.join(library_path, 'Kconfig'), os.path.join(library_dir, 'Kconfig'))