From db61c0d3776fb8f9b7de2a8f5c6ad916f49f3933 Mon Sep 17 00:00:00 2001
From: supperthomas <78900636@qq.com>
Date: Sat, 27 Feb 2021 00:15:53 +0800
Subject: [PATCH] [bsp/max32660] remove the microlib about keil

---
 bsp/maxim/MAX32660_EVSYS/project.uvoptx       | 34 ++++------------
 bsp/maxim/MAX32660_EVSYS/project.uvprojx      |  2 +-
 bsp/maxim/MAX32660_EVSYS/template.uvprojx     |  2 +-
 .../Maxim/MAX32660/Source/system_max32660.c   | 39 ++++++++++---------
 4 files changed, 30 insertions(+), 47 deletions(-)

diff --git a/bsp/maxim/MAX32660_EVSYS/project.uvoptx b/bsp/maxim/MAX32660_EVSYS/project.uvoptx
index ff7f9de14e..a8359d025b 100644
--- a/bsp/maxim/MAX32660_EVSYS/project.uvoptx
+++ b/bsp/maxim/MAX32660_EVSYS/project.uvoptx
@@ -117,26 +117,6 @@
         <pMon>BIN\CMSIS_AGDI.dll</pMon>
       </DebugOpt>
       <TargetDriverDllRegistry>
-        <SetRegEntry>
-          <Number>0</Number>
-          <Key>ARMRTXEVENTFLAGS</Key>
-          <Name>-L70 -Z18 -C0 -M0 -T1</Name>
-        </SetRegEntry>
-        <SetRegEntry>
-          <Number>0</Number>
-          <Key>DLGTARM</Key>
-          <Name>(1010=-1,-1,-1,-1,0)(1007=-1,-1,-1,-1,0)(1008=-1,-1,-1,-1,0)(1009=-1,-1,-1,-1,0)</Name>
-        </SetRegEntry>
-        <SetRegEntry>
-          <Number>0</Number>
-          <Key>ARMDBGFLAGS</Key>
-          <Name></Name>
-        </SetRegEntry>
-        <SetRegEntry>
-          <Number>0</Number>
-          <Key>DLGUARM</Key>
-          <Name></Name>
-        </SetRegEntry>
         <SetRegEntry>
           <Number>0</Number>
           <Key>CMSIS_AGDI</Key>
@@ -155,12 +135,12 @@
       <DebugFlag>
         <trace>0</trace>
         <periodic>0</periodic>
-        <aLwin>1</aLwin>
+        <aLwin>0</aLwin>
         <aCover>0</aCover>
         <aSer1>0</aSer1>
         <aSer2>0</aSer2>
         <aPa>0</aPa>
-        <viewmode>1</viewmode>
+        <viewmode>0</viewmode>
         <vrSel>0</vrSel>
         <aSym>0</aSym>
         <aTbox>0</aTbox>
@@ -223,7 +203,7 @@
 
   <Group>
     <GroupName>CPU</GroupName>
-    <tvExp>1</tvExp>
+    <tvExp>0</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
@@ -291,7 +271,7 @@
 
   <Group>
     <GroupName>DeviceDrivers</GroupName>
-    <tvExp>1</tvExp>
+    <tvExp>0</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
@@ -407,7 +387,7 @@
 
   <Group>
     <GroupName>Drivers</GroupName>
-    <tvExp>1</tvExp>
+    <tvExp>0</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
@@ -463,7 +443,7 @@
 
   <Group>
     <GroupName>finsh</GroupName>
-    <tvExp>1</tvExp>
+    <tvExp>0</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
@@ -507,7 +487,7 @@
 
   <Group>
     <GroupName>Kernel</GroupName>
-    <tvExp>1</tvExp>
+    <tvExp>0</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
diff --git a/bsp/maxim/MAX32660_EVSYS/project.uvprojx b/bsp/maxim/MAX32660_EVSYS/project.uvprojx
index 7b23a65cbc..5f53b9696b 100644
--- a/bsp/maxim/MAX32660_EVSYS/project.uvprojx
+++ b/bsp/maxim/MAX32660_EVSYS/project.uvprojx
@@ -188,7 +188,7 @@
             <hadIRAM2>0</hadIRAM2>
             <hadIROM2>0</hadIROM2>
             <StupSel>8</StupSel>
-            <useUlib>1</useUlib>
+            <useUlib>0</useUlib>
             <EndSel>0</EndSel>
             <uLtcg>0</uLtcg>
             <nSecure>0</nSecure>
diff --git a/bsp/maxim/MAX32660_EVSYS/template.uvprojx b/bsp/maxim/MAX32660_EVSYS/template.uvprojx
index 1ea2e5a7ba..47b809b51d 100644
--- a/bsp/maxim/MAX32660_EVSYS/template.uvprojx
+++ b/bsp/maxim/MAX32660_EVSYS/template.uvprojx
@@ -188,7 +188,7 @@
             <hadIRAM2>0</hadIRAM2>
             <hadIROM2>0</hadIROM2>
             <StupSel>8</StupSel>
-            <useUlib>1</useUlib>
+            <useUlib>0</useUlib>
             <EndSel>0</EndSel>
             <uLtcg>0</uLtcg>
             <nSecure>0</nSecure>
diff --git a/bsp/maxim/libraries/MAX32660PeriphDriver/CMSIS/Device/Maxim/MAX32660/Source/system_max32660.c b/bsp/maxim/libraries/MAX32660PeriphDriver/CMSIS/Device/Maxim/MAX32660/Source/system_max32660.c
index 1d404cc48d..0f3b061e8a 100644
--- a/bsp/maxim/libraries/MAX32660PeriphDriver/CMSIS/Device/Maxim/MAX32660/Source/system_max32660.c
+++ b/bsp/maxim/libraries/MAX32660PeriphDriver/CMSIS/Device/Maxim/MAX32660/Source/system_max32660.c
@@ -95,6 +95,9 @@ __weak void SystemCoreClockUpdate(void)
 __weak int PreInit(void)
 {
     /* Do nothing */
+#if defined ( __CC_ARM )
+    SystemInit();
+#endif
     return 0;
 }
 
@@ -145,23 +148,23 @@ __weak void SystemInit(void)
     Board_Init();
 }
 
-#if defined ( __CC_ARM )
-/* Global variable initialization does not occur until post scatterload in Keil tools.*/
+//#if defined ( __CC_ARM )
+///* Global variable initialization does not occur until post scatterload in Keil tools.*/
 
-/* External function called after our post scatterload function implementation. */
-extern void $Super$$__main_after_scatterload(void);
+///* External function called after our post scatterload function implementation. */
+//extern void $Super$$__main_after_scatterload(void);
 
-/**
- * @brief   Initialization function for SystemCoreClock and Board_Init.
- * @details $Sub$$__main_after_scatterload is called during system startup in the Keil
- *          toolset. Global variable and static variable space must be set up by the compiler
- *          prior to using these memory spaces. Setting up the SystemCoreClock and Board_Init
- *          require global memory for variable storage and are called from this function in
- *          the Keil tool chain.
- */
-void $Sub$$__main_after_scatterload(void)
-{
-    SystemInit();
-    $Super$$__main_after_scatterload();
-}
-#endif /* __CC_ARM */
+///**
+// * @brief   Initialization function for SystemCoreClock and Board_Init.
+// * @details $Sub$$__main_after_scatterload is called during system startup in the Keil
+// *          toolset. Global variable and static variable space must be set up by the compiler
+// *          prior to using these memory spaces. Setting up the SystemCoreClock and Board_Init
+// *          require global memory for variable storage and are called from this function in
+// *          the Keil tool chain.
+// */
+//void $Sub$$__main_after_scatterload(void)
+//{
+//    SystemInit();
+//    $Super$$__main_after_scatterload();
+//}
+//#endif /* __CC_ARM */