【修改】Kconfig配置，与README.md保持一致。

Signed-off-by: Willian Chan <chentingwei@rt-thread.com>
2019-04-10 10:48:08 +08:00 · 2019-04-10 10:48:08 +08:00 · d8e004fb04
parent b3d7073fff
commit d8e004fb04
10 changed files with 1085 additions and 220 deletions
--- a/bsp/stm32/stm32f469-st-disco/.config
+++ b/bsp/stm32/stm32f469-st-disco/.config
@ -386,10 +386,7 @@ CONFIG_SOC_STM32F469NI=y
 #
 CONFIG_BSP_USING_GPIO=y
 CONFIG_BSP_USING_UART=y
-CONFIG_BSP_USING_UART1=y
-# CONFIG_BSP_UART1_RX_USING_DMA is not set
-# CONFIG_BSP_USING_SPI is not set
-# CONFIG_BSP_USING_I2C1 is not set
+CONFIG_BSP_USING_UART3=y

 #
 # Board extended module Drivers
--- a/bsp/stm32/stm32f469-st-disco/README.md
+++ b/bsp/stm32/stm32f469-st-disco/README.md
@ -28,7 +28,7 @@ STM32F469-ST-DISCO 是 ST 推出的一款基于 ARM Cortex-M4 内核的开发板
 - 常用外设
  - LED：4个，LD1（绿色，PG6），LD2（橙色，PD4），LD3（红色，PD5），LD4（蓝色，PK3）
  - 按键：1个，USER（兼具唤醒功能，PA0）
-  - LCD液晶显示屏
+  - LCD
  - 音频
  - 板载 ST-LINK/V2.1 功能
 - 常用接口：Arduino Uno接口、SD 卡接口、音频接口、LCD 接口等
@ -108,5 +108,5 @@ msh >

 维护人:

-  [WillianChan](https://github.com/willianchanlovegithub), 邮箱：<willianchan_lovelife@foxmail.com>
+-  [WillianChan](https://github.com/willianchanlovegithub)

--- a/bsp/stm32/stm32f469-st-disco/SConstruct
+++ b/bsp/stm32/stm32f469-st-disco/SConstruct
@ -15,7 +15,7 @@ except:
    print(RTT_ROOT)
    exit(-1)

-TARGET = 'rt-thread.' + rtconfig.TARGET_EXT
+TARGET = 'rtthread.' + rtconfig.TARGET_EXT

 env = Environment(tools = ['mingw'],
    AS = rtconfig.AS, ASFLAGS = rtconfig.AFLAGS,
@ -28,7 +28,7 @@ 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 rtthread.map')

 Export('RTT_ROOT')
 Export('rtconfig')
--- a/bsp/stm32/stm32f469-st-disco/board/Kconfig
+++ b/bsp/stm32/stm32f469-st-disco/board/Kconfig
@ -21,52 +21,10 @@ menu "On-chip Peripheral Drivers"
        default y
        select RT_USING_SERIAL
        if BSP_USING_UART
-            config BSP_USING_UART1
-                bool "Enable UART1"
+            config BSP_USING_UART3
+                bool "Enable UART3"
                default y

-            config BSP_UART1_RX_USING_DMA
-                bool "Enable UART1 RX DMA"
-                depends on BSP_USING_UART1 && RT_SERIAL_USING_DMA
-                default n
-        endif
-
-    menuconfig BSP_USING_SPI
-        bool "Enable SPI BUS"
-        default n
-        select RT_USING_SPI
-        if BSP_USING_SPI
-            config BSP_USING_SPI1
-                bool "Enable SPI1 BUS"
-                default n
-
-            config BSP_SPI1_TX_USING_DMA
-                bool "Enable SPI1 TX DMA"
-                depends on BSP_USING_SPI1
-                default n
-                
-            config BSP_SPI1_RX_USING_DMA
-                bool "Enable SPI1 RX DMA"
-                depends on BSP_USING_SPI1
-                select BSP_SPI1_TX_USING_DMA
-                default n
-        endif
-
-    menuconfig BSP_USING_I2C1
-        bool "Enable I2C1 BUS (software simulation)"
-        default n
-        select RT_USING_I2C
-        select RT_USING_I2C_BITOPS
-        select RT_USING_PIN
-        if BSP_USING_I2C1
-            config BSP_I2C1_SCL_PIN
-                int "i2c1 scl pin number"
-                range 1 216
-                default 15
-            config BSP_I2C1_SDA_PIN
-                int "I2C1 sda pin number"
-                range 1 216
-                default 16
        endif

 endmenu
--- a/bsp/stm32/stm32f469-st-disco/project.uvopt
+++ b/bsp/stm32/stm32f469-st-disco/project.uvopt
--- a/bsp/stm32/stm32f469-st-disco/project.uvoptx
+++ b/bsp/stm32/stm32f469-st-disco/project.uvoptx
@ -73,7 +73,7 @@
        <LExpSel>0</LExpSel>
      </OPTXL>
      <OPTFL>
-        <tvExp>1</tvExp>
+        <tvExp>0</tvExp>
        <tvExpOptDlg>0</tvExpOptDlg>
        <IsCurrentTarget>1</IsCurrentTarget>
      </OPTFL>
@ -376,7 +376,7 @@

  <Group>
    <GroupName>Applications</GroupName>
-    <tvExp>1</tvExp>
+    <tvExp>0</tvExp>
    <tvExpOptDlg>0</tvExpOptDlg>
    <cbSel>0</cbSel>
    <RteFlg>0</RteFlg>
--- a/bsp/stm32/stm32f469-st-disco/project.uvproj
+++ b/bsp/stm32/stm32f469-st-disco/project.uvproj
@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 <Project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="project_proj.xsd">
+
  <SchemaVersion>1.1</SchemaVersion>
+
  <Header>### uVision Project, (C) Keil Software</Header>
+
  <Targets>
    <Target>
      <TargetName>rt-thread</TargetName>
@ -12,26 +15,26 @@
          <Device>STM32F407ZG</Device>
          <Vendor>STMicroelectronics</Vendor>
          <Cpu>IRAM(0x20000000-0x2001FFFF) IRAM2(0x10000000-0x1000FFFF) IROM(0x8000000-0x80FFFFF) CLOCK(25000000) CPUTYPE("Cortex-M4") FPU2</Cpu>
-          <FlashUtilSpec />
+          <FlashUtilSpec></FlashUtilSpec>
          <StartupFile>"Startup\ST\STM32F4xx\startup_stm32f40_41xxx.s" ("STM32F40/41xxx Startup Code")</StartupFile>
          <FlashDriverDll>UL2CM3(-O207 -S0 -C0 -FO7 -FD20000000 -FC800 -FN1 -FF0STM32F4xx_1024 -FS08000000 -FL0100000)</FlashDriverDll>
          <DeviceId>6105</DeviceId>
          <RegisterFile>stm32f4xx.h</RegisterFile>
-          <MemoryEnv />
-          <Cmp />
-          <Asm />
-          <Linker />
-          <OHString />
-          <InfinionOptionDll />
+          <MemoryEnv></MemoryEnv>
+          <Cmp></Cmp>
+          <Asm></Asm>
+          <Linker></Linker>
+          <OHString></OHString>
+          <InfinionOptionDll></InfinionOptionDll>
          <SLE66CMisc>-DSTM32F40_41xxx</SLE66CMisc>
-          <SLE66AMisc />
-          <SLE66LinkerMisc />
+          <SLE66AMisc></SLE66AMisc>
+          <SLE66LinkerMisc></SLE66LinkerMisc>
          <SFDFile>SFD\ST\STM32F4xx\STM32F40x.sfr</SFDFile>
          <bCustSvd>0</bCustSvd>
          <UseEnv>0</UseEnv>
-          <BinPath />
-          <IncludePath />
-          <LibPath />
+          <BinPath></BinPath>
+          <IncludePath></IncludePath>
+          <LibPath></LibPath>
          <RegisterFilePath>ST\STM32F4xx\</RegisterFilePath>
          <DBRegisterFilePath>ST\STM32F4xx\</DBRegisterFilePath>
          <TargetStatus>
@ -42,7 +45,7 @@
            <InvalidFlash>1</InvalidFlash>
          </TargetStatus>
          <OutputDirectory>.\build\keil\Obj\</OutputDirectory>
-          <OutputName>rt-thread</OutputName>
+          <OutputName>rtthread</OutputName>
          <CreateExecutable>1</CreateExecutable>
          <CreateLib>0</CreateLib>
          <CreateHexFile>0</CreateHexFile>
@ -55,8 +58,8 @@
          <BeforeCompile>
            <RunUserProg1>0</RunUserProg1>
            <RunUserProg2>0</RunUserProg2>
-            <UserProg1Name />
-            <UserProg2Name />
+            <UserProg1Name></UserProg1Name>
+            <UserProg2Name></UserProg2Name>
            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
            <nStopU1X>0</nStopU1X>
@ -65,8 +68,8 @@
          <BeforeMake>
            <RunUserProg1>0</RunUserProg1>
            <RunUserProg2>0</RunUserProg2>
-            <UserProg1Name />
-            <UserProg2Name />
+            <UserProg1Name></UserProg1Name>
+            <UserProg2Name></UserProg2Name>
            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
          </BeforeMake>
@ -74,12 +77,12 @@
            <RunUserProg1>1</RunUserProg1>
            <RunUserProg2>0</RunUserProg2>
            <UserProg1Name>fromelf --bin !L --output rtthread.bin</UserProg1Name>
-            <UserProg2Name />
+            <UserProg2Name></UserProg2Name>
            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
          </AfterMake>
          <SelectedForBatchBuild>0</SelectedForBatchBuild>
-          <SVCSIdString />
+          <SVCSIdString></SVCSIdString>
        </TargetCommonOption>
        <CommonProperty>
          <UseCPPCompiler>0</UseCPPCompiler>
@ -93,8 +96,8 @@
          <AssembleAssemblyFile>0</AssembleAssemblyFile>
          <PublicsOnly>0</PublicsOnly>
          <StopOnExitCode>3</StopOnExitCode>
-          <CustomArgument />
-          <IncludeLibraryModules />
+          <CustomArgument></CustomArgument>
+          <IncludeLibraryModules></IncludeLibraryModules>
          <ComprImg>1</ComprImg>
        </CommonProperty>
        <DllOption>
@ -138,24 +141,24 @@
            <RestoreToolbox>1</RestoreToolbox>
            <RestoreTracepoints>0</RestoreTracepoints>
            <RestoreSysVw>1</RestoreSysVw>
-            <UsePdscDebugDescription>0</UsePdscDebugDescription>
+            <UsePdscDebugDescription>1</UsePdscDebugDescription>
          </Target>
          <RunDebugAfterBuild>0</RunDebugAfterBuild>
-          <TargetSelection>6</TargetSelection>
+          <TargetSelection>-1</TargetSelection>
          <SimDlls>
-            <CpuDll />
-            <CpuDllArguments />
-            <PeripheralDll />
-            <PeripheralDllArguments />
-            <InitializationFile />
+            <CpuDll></CpuDll>
+            <CpuDllArguments></CpuDllArguments>
+            <PeripheralDll></PeripheralDll>
+            <PeripheralDllArguments></PeripheralDllArguments>
+            <InitializationFile></InitializationFile>
          </SimDlls>
          <TargetDlls>
-            <CpuDll />
-            <CpuDllArguments />
-            <PeripheralDll />
-            <PeripheralDllArguments />
-            <InitializationFile />
-            <Driver>Segger\JL2CM3.dll</Driver>
+            <CpuDll></CpuDll>
+            <CpuDllArguments></CpuDllArguments>
+            <PeripheralDll></PeripheralDll>
+            <PeripheralDllArguments></PeripheralDllArguments>
+            <InitializationFile></InitializationFile>
+            <Driver>STLink\ST-LINKIII-KEIL_SWO.dll</Driver>
          </TargetDlls>
        </DebugOption>
        <Utilities>
@ -170,10 +173,10 @@
          <bUseTDR>1</bUseTDR>
          <Flash2>BIN\UL2CM3.DLL</Flash2>
          <Flash3>"" ()</Flash3>
-          <Flash4 />
-          <pFcarmOut />
-          <pFcarmGrp />
-          <pFcArmRoot />
+          <Flash4></Flash4>
+          <pFcarmOut></pFcarmOut>
+          <pFcarmGrp></pFcarmGrp>
+          <pFcArmRoot></pFcArmRoot>
          <FcArmLst>0</FcArmLst>
        </Utilities>
        <TargetArmAds>
@ -206,7 +209,7 @@
            <RvctClst>0</RvctClst>
            <GenPPlst>0</GenPPlst>
            <AdsCpuType>"Cortex-M4"</AdsCpuType>
-            <RvctDeviceName />
+            <RvctDeviceName></RvctDeviceName>
            <mOS>0</mOS>
            <uocRom>0</uocRom>
            <uocRam>0</uocRam>
@ -337,7 +340,7 @@
                <Size>0x10000</Size>
              </OCR_RVCT10>
            </OnChipMemories>
-            <RvctStartVector />
+            <RvctStartVector></RvctStartVector>
          </ArmAdsMisc>
          <Cads>
            <interw>1</interw>
@ -356,9 +359,9 @@
            <uC99>1</uC99>
            <useXO>0</useXO>
            <VariousControls>
-              <MiscControls />
+              <MiscControls></MiscControls>
              <Define>USE_HAL_DRIVER, STM32F469xx</Define>
-              <Undefine />
+              <Undefine></Undefine>
              <IncludePath>.;..\..\..\include;applications;.;board;board\CubeMX_Config\Inc;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m4;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\finsh;..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Inc;..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Include;..\libraries\STM32F4xx_HAL\CMSIS\Include</IncludePath>
            </VariousControls>
          </Cads>
@ -373,10 +376,10 @@
            <uSurpInc>0</uSurpInc>
            <useXO>0</useXO>
            <VariousControls>
-              <MiscControls />
-              <Define />
-              <Undefine />
-              <IncludePath />
+              <MiscControls></MiscControls>
+              <Define></Define>
+              <Undefine></Undefine>
+              <IncludePath></IncludePath>
            </VariousControls>
          </Aads>
          <LDads>
@ -388,13 +391,13 @@
            <useFile>0</useFile>
            <TextAddressRange>0x08000000</TextAddressRange>
            <DataAddressRange>0x20000000</DataAddressRange>
-            <pXoBase />
+            <pXoBase></pXoBase>
            <ScatterFile>.\board\linker_scripts\link.sct</ScatterFile>
-            <IncludeLibs />
-            <IncludeLibsPath />
-            <Misc />
-            <LinkerInputFile />
-            <DisabledWarnings />
+            <IncludeLibs></IncludeLibs>
+            <IncludeLibsPath></IncludeLibsPath>
+            <Misc></Misc>
+            <LinkerInputFile></LinkerInputFile>
+            <DisabledWarnings></DisabledWarnings>
          </LDads>
        </TargetArmAds>
      </TargetOption>
@ -407,99 +410,71 @@
              <FileType>1</FileType>
              <FilePath>..\..\..\src\clock.c</FilePath>
            </File>
-          </Files>
-          <Files>
            <File>
              <FileName>components.c</FileName>
              <FileType>1</FileType>
              <FilePath>..\..\..\src\components.c</FilePath>
            </File>
-          </Files>
-          <Files>
            <File>
              <FileName>cpu.c</FileName>
              <FileType>1</FileType>
              <FilePath>..\..\..\src\cpu.c</FilePath>
            </File>
-          </Files>
-          <Files>
            <File>
              <FileName>device.c</FileName>
              <FileType>1</FileType>
              <FilePath>..\..\..\src\device.c</FilePath>
            </File>
-          </Files>
-          <Files>
            <File>
              <FileName>idle.c</FileName>
              <FileType>1</FileType>
              <FilePath>..\..\..\src\idle.c</FilePath>
            </File>
-          </Files>
-          <Files>
            <File>
              <FileName>ipc.c</FileName>
              <FileType>1</FileType>
              <FilePath>..\..\..\src\ipc.c</FilePath>
            </File>
-          </Files>
-          <Files>
            <File>
              <FileName>irq.c</FileName>
              <FileType>1</FileType>
              <FilePath>..\..\..\src\irq.c</FilePath>
            </File>
-          </Files>
-          <Files>
            <File>
              <FileName>kservice.c</FileName>
              <FileType>1</FileType>
              <FilePath>..\..\..\src\kservice.c</FilePath>
            </File>
-          </Files>
-          <Files>
            <File>
              <FileName>mem.c</FileName>
              <FileType>1</FileType>
              <FilePath>..\..\..\src\mem.c</FilePath>
            </File>
-          </Files>
-          <Files>
            <File>
              <FileName>mempool.c</FileName>
              <FileType>1</FileType>
              <FilePath>..\..\..\src\mempool.c</FilePath>
            </File>
-          </Files>
-          <Files>
            <File>
              <FileName>object.c</FileName>
              <FileType>1</FileType>
              <FilePath>..\..\..\src\object.c</FilePath>
            </File>
-          </Files>
-          <Files>
            <File>
              <FileName>scheduler.c</FileName>
              <FileType>1</FileType>
              <FilePath>..\..\..\src\scheduler.c</FilePath>
            </File>
-          </Files>
-          <Files>
            <File>
              <FileName>signal.c</FileName>
              <FileType>1</FileType>
              <FilePath>..\..\..\src\signal.c</FilePath>
            </File>
-          </Files>
-          <Files>
            <File>
              <FileName>thread.c</FileName>
              <FileType>1</FileType>
              <FilePath>..\..\..\src\thread.c</FilePath>
            </File>
-          </Files>
-          <Files>
            <File>
              <FileName>timer.c</FileName>
              <FileType>1</FileType>
@ -525,36 +500,26 @@
              <FileType>1</FileType>
              <FilePath>board\board.c</FilePath>
            </File>
-          </Files>
-          <Files>
            <File>
              <FileName>stm32f4xx_hal_msp.c</FileName>
              <FileType>1</FileType>
              <FilePath>board\CubeMX_Config\Src\stm32f4xx_hal_msp.c</FilePath>
            </File>
-          </Files>
-          <Files>
            <File>
              <FileName>startup_stm32f469xx.s</FileName>
              <FileType>2</FileType>
              <FilePath>..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Source\Templates\arm\startup_stm32f469xx.s</FilePath>
            </File>
-          </Files>
-          <Files>
            <File>
              <FileName>drv_gpio.c</FileName>
              <FileType>1</FileType>
              <FilePath>..\libraries\HAL_Drivers\drv_gpio.c</FilePath>
            </File>
-          </Files>
-          <Files>
            <File>
              <FileName>drv_usart.c</FileName>
              <FileType>1</FileType>
              <FilePath>..\libraries\HAL_Drivers\drv_usart.c</FilePath>
            </File>
-          </Files>
-          <Files>
            <File>
              <FileName>drv_common.c</FileName>
              <FileType>1</FileType>
@ -570,29 +535,21 @@
              <FileType>1</FileType>
              <FilePath>..\..\..\libcpu\arm\common\backtrace.c</FilePath>
            </File>
-          </Files>
-          <Files>
            <File>
              <FileName>div0.c</FileName>
              <FileType>1</FileType>
              <FilePath>..\..\..\libcpu\arm\common\div0.c</FilePath>
            </File>
-          </Files>
-          <Files>
            <File>
              <FileName>showmem.c</FileName>
              <FileType>1</FileType>
              <FilePath>..\..\..\libcpu\arm\common\showmem.c</FilePath>
            </File>
-          </Files>
-          <Files>
            <File>
              <FileName>cpuport.c</FileName>
              <FileType>1</FileType>
              <FilePath>..\..\..\libcpu\arm\cortex-m4\cpuport.c</FilePath>
            </File>
-          </Files>
-          <Files>
            <File>
              <FileName>context_rvds.S</FileName>
              <FileType>2</FileType>
@ -608,57 +565,41 @@
              <FileType>1</FileType>
              <FilePath>..\..\..\components\drivers\misc\pin.c</FilePath>
            </File>
-          </Files>
-          <Files>
            <File>
              <FileName>serial.c</FileName>
              <FileType>1</FileType>
              <FilePath>..\..\..\components\drivers\serial\serial.c</FilePath>
            </File>
-          </Files>
-          <Files>
            <File>
              <FileName>completion.c</FileName>
              <FileType>1</FileType>
              <FilePath>..\..\..\components\drivers\src\completion.c</FilePath>
            </File>
-          </Files>
-          <Files>
            <File>
              <FileName>dataqueue.c</FileName>
              <FileType>1</FileType>
              <FilePath>..\..\..\components\drivers\src\dataqueue.c</FilePath>
            </File>
-          </Files>
-          <Files>
            <File>
              <FileName>pipe.c</FileName>
              <FileType>1</FileType>
              <FilePath>..\..\..\components\drivers\src\pipe.c</FilePath>
            </File>
-          </Files>
-          <Files>
            <File>
              <FileName>ringblk_buf.c</FileName>
              <FileType>1</FileType>
              <FilePath>..\..\..\components\drivers\src\ringblk_buf.c</FilePath>
            </File>
-          </Files>
-          <Files>
            <File>
              <FileName>ringbuffer.c</FileName>
              <FileType>1</FileType>
              <FilePath>..\..\..\components\drivers\src\ringbuffer.c</FilePath>
            </File>
-          </Files>
-          <Files>
            <File>
              <FileName>waitqueue.c</FileName>
              <FileType>1</FileType>
              <FilePath>..\..\..\components\drivers\src\waitqueue.c</FilePath>
            </File>
-          </Files>
-          <Files>
            <File>
              <FileName>workqueue.c</FileName>
              <FileType>1</FileType>
@ -674,36 +615,26 @@
              <FileType>1</FileType>
              <FilePath>..\..\..\components\finsh\shell.c</FilePath>
            </File>
-          </Files>
-          <Files>
            <File>
              <FileName>symbol.c</FileName>
              <FileType>1</FileType>
              <FilePath>..\..\..\components\finsh\symbol.c</FilePath>
            </File>
-          </Files>
-          <Files>
            <File>
              <FileName>cmd.c</FileName>
              <FileType>1</FileType>
              <FilePath>..\..\..\components\finsh\cmd.c</FilePath>
            </File>
-          </Files>
-          <Files>
            <File>
              <FileName>msh.c</FileName>
              <FileType>1</FileType>
              <FilePath>..\..\..\components\finsh\msh.c</FilePath>
            </File>
-          </Files>
-          <Files>
            <File>
              <FileName>msh_cmd.c</FileName>
              <FileType>1</FileType>
              <FilePath>..\..\..\components\finsh\msh_cmd.c</FilePath>
            </File>
-          </Files>
-          <Files>
            <File>
              <FileName>msh_file.c</FileName>
              <FileType>1</FileType>
@ -719,113 +650,81 @@
              <FileType>1</FileType>
              <FilePath>..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Source\Templates\system_stm32f4xx.c</FilePath>
            </File>
-          </Files>
-          <Files>
            <File>
              <FileName>stm32f4xx_hal.c</FileName>
              <FileType>1</FileType>
              <FilePath>..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal.c</FilePath>
            </File>
-          </Files>
-          <Files>
            <File>
              <FileName>stm32f4xx_hal_cec.c</FileName>
              <FileType>1</FileType>
              <FilePath>..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_cec.c</FilePath>
            </File>
-          </Files>
-          <Files>
            <File>
              <FileName>stm32f4xx_hal_cortex.c</FileName>
              <FileType>1</FileType>
              <FilePath>..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_cortex.c</FilePath>
            </File>
-          </Files>
-          <Files>
            <File>
              <FileName>stm32f4xx_hal_crc.c</FileName>
              <FileType>1</FileType>
              <FilePath>..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_crc.c</FilePath>
            </File>
-          </Files>
-          <Files>
            <File>
              <FileName>stm32f4xx_hal_cryp.c</FileName>
              <FileType>1</FileType>
              <FilePath>..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_cryp.c</FilePath>
            </File>
-          </Files>
-          <Files>
            <File>
              <FileName>stm32f4xx_hal_cryp_ex.c</FileName>
              <FileType>1</FileType>
              <FilePath>..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_cryp_ex.c</FilePath>
            </File>
-          </Files>
-          <Files>
            <File>
              <FileName>stm32f4xx_hal_dma.c</FileName>
              <FileType>1</FileType>
              <FilePath>..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_dma.c</FilePath>
            </File>
-          </Files>
-          <Files>
            <File>
              <FileName>stm32f4xx_hal_dma_ex.c</FileName>
              <FileType>1</FileType>
              <FilePath>..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_dma_ex.c</FilePath>
            </File>
-          </Files>
-          <Files>
            <File>
              <FileName>stm32f4xx_hal_pwr.c</FileName>
              <FileType>1</FileType>
              <FilePath>..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_pwr.c</FilePath>
            </File>
-          </Files>
-          <Files>
            <File>
              <FileName>stm32f4xx_hal_pwr_ex.c</FileName>
              <FileType>1</FileType>
              <FilePath>..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_pwr_ex.c</FilePath>
            </File>
-          </Files>
-          <Files>
            <File>
              <FileName>stm32f4xx_hal_rcc.c</FileName>
              <FileType>1</FileType>
              <FilePath>..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_rcc.c</FilePath>
            </File>
-          </Files>
-          <Files>
            <File>
              <FileName>stm32f4xx_hal_rcc_ex.c</FileName>
              <FileType>1</FileType>
              <FilePath>..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_rcc_ex.c</FilePath>
            </File>
-          </Files>
-          <Files>
            <File>
              <FileName>stm32f4xx_hal_rng.c</FileName>
              <FileType>1</FileType>
              <FilePath>..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_rng.c</FilePath>
            </File>
-          </Files>
-          <Files>
            <File>
              <FileName>stm32f4xx_hal_gpio.c</FileName>
              <FileType>1</FileType>
              <FilePath>..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_gpio.c</FilePath>
            </File>
-          </Files>
-          <Files>
            <File>
              <FileName>stm32f4xx_hal_uart.c</FileName>
              <FileType>1</FileType>
              <FilePath>..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_uart.c</FilePath>
            </File>
-          </Files>
-          <Files>
            <File>
              <FileName>stm32f4xx_hal_usart.c</FileName>
              <FileType>1</FileType>
@ -836,4 +735,5 @@
      </Groups>
    </Target>
  </Targets>
+
 </Project>
--- a/bsp/stm32/stm32f469-st-disco/rtconfig.py
+++ b/bsp/stm32/stm32f469-st-disco/rtconfig.py
@ -73,7 +73,7 @@ elif PLATFORM == 'armcc':
    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'
+    LFLAGS = DEVICE + ' --scatter "board\linker_scripts\link.sct" --info sizes --info totals --info unused --info veneers --list rtthread.map --strict'
    CFLAGS += ' -I' + EXEC_PATH + '/ARM/ARMCC/include'
    LFLAGS += ' --libpath=' + EXEC_PATH + '/ARM/ARMCC/lib'

--- a/bsp/stm32/stm32f469-st-disco/template.uvopt
+++ b/bsp/stm32/stm32f469-st-disco/template.uvopt
@ -99,7 +99,7 @@
        <tPdscDbg>0</tPdscDbg>
        <sRunDeb>0</sRunDeb>
        <sLrtime>0</sLrtime>
-        <nTsel>6</nTsel>
+        <nTsel>11</nTsel>
        <sDll></sDll>
        <sDllPa></sDllPa>
        <sDlgDll></sDlgDll>
@ -110,9 +110,14 @@
        <tDlgDll></tDlgDll>
        <tDlgPa></tDlgPa>
        <tIfile></tIfile>
-        <pMon>Segger\JL2CM3.dll</pMon>
+        <pMon>STLink\ST-LINKIII-KEIL_SWO.dll</pMon>
      </DebugOpt>
      <TargetDriverDllRegistry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>ST-LINKIII-KEIL_SWO</Key>
+          <Name>-U -O207 -S0 -C0 -N00("ARM CoreSight SW-DP") -D00(2BA01477) -L00(0) -TO18 -TC10000000 -TP21 -TDS8004 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO15 -FD20000000 -FC800 -FN1 -FF0STM32F4xx_1024 -FS08000000 -FL0100000</Name>
+        </SetRegEntry>
        <SetRegEntry>
          <Number>0</Number>
          <Key>JL2CM3</Key>
--- a/bsp/stm32/stm32f469-st-disco/template.uvproj
+++ b/bsp/stm32/stm32f469-st-disco/template.uvproj
@ -45,7 +45,7 @@
            <InvalidFlash>1</InvalidFlash>
          </TargetStatus>
          <OutputDirectory>.\build\keil\Obj\</OutputDirectory>
-          <OutputName>rt-thread</OutputName>
+          <OutputName>rtthread</OutputName>
          <CreateExecutable>1</CreateExecutable>
          <CreateLib>0</CreateLib>
          <CreateHexFile>0</CreateHexFile>
@ -144,7 +144,7 @@
            <UsePdscDebugDescription>0</UsePdscDebugDescription>
          </Target>
          <RunDebugAfterBuild>0</RunDebugAfterBuild>
-          <TargetSelection>6</TargetSelection>
+          <TargetSelection>11</TargetSelection>
          <SimDlls>
            <CpuDll></CpuDll>
            <CpuDllArguments></CpuDllArguments>
@ -158,7 +158,7 @@
            <PeripheralDll></PeripheralDll>
            <PeripheralDllArguments></PeripheralDllArguments>
            <InitializationFile></InitializationFile>
-            <Driver>Segger\JL2CM3.dll</Driver>
+            <Driver>STLink\ST-LINKIII-KEIL_SWO.dll</Driver>
          </TargetDlls>
        </DebugOption>
        <Utilities>