From c5e9a6a41b622149406f9579d345234894bb04dd Mon Sep 17 00:00:00 2001
From: whj4674672 <whj4674672@163.com>
Date: Tue, 26 Mar 2019 17:03:43 +0800
Subject: [PATCH] =?UTF-8?q?[WIP][stm32]=E4=BF=AE=E6=94=B9PR=20STM32H743?=
 =?UTF-8?q?=E4=B8=AD=E5=AD=98=E5=9C=A8=E7=9A=84=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bsp/stm32/stm32h743-atk-apollo/SConstruct       |  4 ++--
 bsp/stm32/stm32h743-atk-apollo/board/SConscript |  6 +++---
 bsp/stm32/stm32h743-atk-apollo/project.ewp      |  2 +-
 bsp/stm32/stm32h743-atk-apollo/template.uvoptx  | 10 +++++-----
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/bsp/stm32/stm32h743-atk-apollo/SConstruct b/bsp/stm32/stm32h743-atk-apollo/SConstruct
index c3520af530..7cf638765c 100644
--- a/bsp/stm32/stm32h743-atk-apollo/SConstruct
+++ b/bsp/stm32/stm32h743-atk-apollo/SConstruct
@@ -49,10 +49,10 @@ objs = PrepareBuilding(env, RTT_ROOT, has_libcpu=False)
 stm32_library = 'STM32H7xx_HAL'
 rtconfig.BSP_LIBRARY_TYPE = stm32_library
 
-# include drivers
+# include libraries
 objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript')))
 
-# include libraries
+# include drivers
 objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript')))
 
 # make a building
diff --git a/bsp/stm32/stm32h743-atk-apollo/board/SConscript b/bsp/stm32/stm32h743-atk-apollo/board/SConscript
index 4a4c806804..3eb9aef40f 100644
--- a/bsp/stm32/stm32h743-atk-apollo/board/SConscript
+++ b/bsp/stm32/stm32h743-atk-apollo/board/SConscript
@@ -11,11 +11,11 @@ path = [cwd]
 path += [cwd + '/CubeMX_Config/Inc']
 
 if rtconfig.CROSS_TOOL == 'gcc':
-    src += [cwd + '/../../libraries/STM32H7xx_HAL/CMSIS/Device/ST/STM32H7xx/Source/Templates/gcc/startup_stm32h743xx.s']
+    src += [startup_path_prefix + '/../../libraries/STM32H7xx_HAL/CMSIS/Device/ST/STM32H7xx/Source/Templates/gcc/startup_stm32h743xx.s']
 elif rtconfig.CROSS_TOOL == 'keil':
-    src += [cwd + '/../../libraries/STM32H7xx_HAL/CMSIS/Device/ST/STM32H7xx/Source/Templates/arm/startup_stm32h743xx.s']
+    src += [startup_path_prefix + '/../../libraries/STM32H7xx_HAL/CMSIS/Device/ST/STM32H7xx/Source/Templates/arm/startup_stm32h743xx.s']
 elif rtconfig.CROSS_TOOL == 'iar':
-    src += [cwd + '/../../libraries/STM32H7xx_HAL/CMSIS/Device/ST/STM32H7xx/Source/Templates/iar/startup_stm32h743xx.s']
+    src += [startup_path_prefix + '/../../libraries/STM32H7xx_HAL/CMSIS/Device/ST/STM32H7xx/Source/Templates/iar/startup_stm32h743xx.s']
 
 # STM32H743xx || STM32H750xx || STM32F753xx
 # You can select chips from the list above
diff --git a/bsp/stm32/stm32h743-atk-apollo/project.ewp b/bsp/stm32/stm32h743-atk-apollo/project.ewp
index 8c1f4e66bb..8f3626888a 100644
--- a/bsp/stm32/stm32h743-atk-apollo/project.ewp
+++ b/bsp/stm32/stm32h743-atk-apollo/project.ewp
@@ -77,7 +77,7 @@
         </option>
         <option>
           <name>OGChipSelectEditMenu</name>
-          <state>STM32F407ZG	ST STM32F407ZG</state>
+          <state>STM32H743II	ST STM32H743II</state>
         </option>
         <option>
           <name>GenLowLevelInterface</name>
diff --git a/bsp/stm32/stm32h743-atk-apollo/template.uvoptx b/bsp/stm32/stm32h743-atk-apollo/template.uvoptx
index b727aa8c58..78d017b7db 100644
--- a/bsp/stm32/stm32h743-atk-apollo/template.uvoptx
+++ b/bsp/stm32/stm32h743-atk-apollo/template.uvoptx
@@ -22,13 +22,13 @@
   </DaveTm>
 
   <Target>
-    <TargetName>rt-thread</TargetName>
+    <TargetName>rtthread</TargetName>
     <ToolsetNumber>0x4</ToolsetNumber>
     <ToolsetName>ARM-ADS</ToolsetName>
     <TargetOption>
       <CLKADS>12000000</CLKADS>
       <OPTTT>
-        <gFlags>0</gFlags>
+        <gFlags>1</gFlags>
         <BeepAtEnd>1</BeepAtEnd>
         <RunSim>0</RunSim>
         <RunTarget>1</RunTarget>
@@ -77,7 +77,7 @@
         <tvExpOptDlg>0</tvExpOptDlg>
         <IsCurrentTarget>1</IsCurrentTarget>
       </OPTFL>
-      <CpuCode>0</CpuCode>
+      <CpuCode>18</CpuCode>
       <DebugOpt>
         <uSim>0</uSim>
         <uTrg>1</uTrg>
@@ -101,7 +101,7 @@
         <sRunDeb>0</sRunDeb>
         <sLrtime>0</sLrtime>
         <bEvRecOn>1</bEvRecOn>
-        <nTsel>0</nTsel>
+        <nTsel>5</nTsel>
         <sDll></sDll>
         <sDllPa></sDllPa>
         <sDlgDll></sDlgDll>
@@ -112,7 +112,7 @@
         <tDlgDll></tDlgDll>
         <tDlgPa></tDlgPa>
         <tIfile></tIfile>
-        <pMon>BIN\UL2CM3.DLL</pMon>
+        <pMon>STLink\ST-LINKIII-KEIL_SWO.dll</pMon>
       </DebugOpt>
       <TargetDriverDllRegistry>
         <SetRegEntry>