From ff68942ce4cf0ab7b4c3059ef588525b485de9cd Mon Sep 17 00:00:00 2001
From: kojo <kojo@wolfSLL.com>
Date: Tue, 21 May 2013 18:47:54 +0900
Subject: [PATCH] MDK-ARM ready for LCP/STM

---
 .../MDK-ARM/CyaSSL/config-BARE-METAL.h        |  2 +-
 IDE/MDK-ARM/Projects/MDK-ARM-LCP43xx.uvopt    | 12 ++---
 IDE/MDK-ARM/Projects/MDK-ARM-STM32F2xx.uvopt  | 54 ++++++++++++-------
 IDE/MDK-ARM/Projects/MDK-ARM-STM32F2xx.uvproj | 27 +++++++---
 ctaocrypt/src/random.c                        |  2 +-
 5 files changed, 64 insertions(+), 33 deletions(-)

diff --git a/IDE/MDK-ARM/MDK-ARM/CyaSSL/config-BARE-METAL.h b/IDE/MDK-ARM/MDK-ARM/CyaSSL/config-BARE-METAL.h
index a88e1bca4..680bdaf38 100644
--- a/IDE/MDK-ARM/MDK-ARM/CyaSSL/config-BARE-METAL.h
+++ b/IDE/MDK-ARM/MDK-ARM/CyaSSL/config-BARE-METAL.h
@@ -78,7 +78,7 @@
 
 //  <h>STM32 Hardware Crypt
 //      <e>STM32F2 Hardware RNG
-#define MDK_CONF_STM32F2_RNG 0
+#define MDK_CONF_STM32F2_RNG 1
 #if MDK_CONF_STM32F2_RNG == 1
 #define STM32F2_RNG
 #else
diff --git a/IDE/MDK-ARM/Projects/MDK-ARM-LCP43xx.uvopt b/IDE/MDK-ARM/Projects/MDK-ARM-LCP43xx.uvopt
index 2b66588fc..2a0fae1eb 100644
--- a/IDE/MDK-ARM/Projects/MDK-ARM-LCP43xx.uvopt
+++ b/IDE/MDK-ARM/Projects/MDK-ARM-LCP43xx.uvopt
@@ -635,7 +635,7 @@
       <Focus>0</Focus>
       <ColumnNumber>0</ColumnNumber>
       <tvExpOptDlg>0</tvExpOptDlg>
-      <TopLine>139</TopLine>
+      <TopLine>140</TopLine>
       <CurrentLine>156</CurrentLine>
       <bDave2>0</bDave2>
       <PathWithFileName>..\MDK-ARM\CyaSSL\main.c</PathWithFileName>
@@ -811,7 +811,7 @@
       <Focus>0</Focus>
       <ColumnNumber>0</ColumnNumber>
       <tvExpOptDlg>0</tvExpOptDlg>
-      <TopLine>47</TopLine>
+      <TopLine>48</TopLine>
       <CurrentLine>58</CurrentLine>
       <bDave2>0</bDave2>
       <PathWithFileName>C:\Keil\ARM\Boards\Keil\MCB4300\RL\FlashFS\SD_File\Serial.c</PathWithFileName>
@@ -843,7 +843,7 @@
       <Focus>0</Focus>
       <ColumnNumber>0</ColumnNumber>
       <tvExpOptDlg>0</tvExpOptDlg>
-      <TopLine>258</TopLine>
+      <TopLine>259</TopLine>
       <CurrentLine>260</CurrentLine>
       <bDave2>0</bDave2>
       <PathWithFileName>C:\Keil\ARM\Boards\Keil\MCB4300\RL\FlashFS\SD_File\SDIO_LPC43xx.c</PathWithFileName>
@@ -1651,7 +1651,7 @@
       <Focus>0</Focus>
       <ColumnNumber>0</ColumnNumber>
       <tvExpOptDlg>0</tvExpOptDlg>
-      <TopLine>145</TopLine>
+      <TopLine>146</TopLine>
       <CurrentLine>151</CurrentLine>
       <bDave2>0</bDave2>
       <PathWithFileName>..\LPC43xx\startup_LPC43xx.s</PathWithFileName>
@@ -1675,7 +1675,7 @@
       <Focus>0</Focus>
       <ColumnNumber>0</ColumnNumber>
       <tvExpOptDlg>0</tvExpOptDlg>
-      <TopLine>163</TopLine>
+      <TopLine>165</TopLine>
       <CurrentLine>182</CurrentLine>
       <bDave2>0</bDave2>
       <PathWithFileName>..\MDK-ARM\CyaSSL\cyassl_MDK_ARM.c</PathWithFileName>
@@ -1691,7 +1691,7 @@
       <Focus>0</Focus>
       <ColumnNumber>0</ColumnNumber>
       <tvExpOptDlg>0</tvExpOptDlg>
-      <TopLine>50</TopLine>
+      <TopLine>51</TopLine>
       <CurrentLine>59</CurrentLine>
       <bDave2>0</bDave2>
       <PathWithFileName>..\MDK-ARM\CyaSSL\Retarget.c</PathWithFileName>
diff --git a/IDE/MDK-ARM/Projects/MDK-ARM-STM32F2xx.uvopt b/IDE/MDK-ARM/Projects/MDK-ARM-STM32F2xx.uvopt
index 49b94308c..89ee2a1d5 100644
--- a/IDE/MDK-ARM/Projects/MDK-ARM-STM32F2xx.uvopt
+++ b/IDE/MDK-ARM/Projects/MDK-ARM-STM32F2xx.uvopt
@@ -490,7 +490,7 @@
 
   <Group>
     <GroupName>CyaSSL Apps</GroupName>
-    <tvExp>1</tvExp>
+    <tvExp>0</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
@@ -614,8 +614,8 @@
       <Focus>0</Focus>
       <ColumnNumber>0</ColumnNumber>
       <tvExpOptDlg>0</tvExpOptDlg>
-      <TopLine>209</TopLine>
-      <CurrentLine>220</CurrentLine>
+      <TopLine>135</TopLine>
+      <CurrentLine>149</CurrentLine>
       <bDave2>0</bDave2>
       <PathWithFileName>..\MDK-ARM\CyaSSL\main.c</PathWithFileName>
       <FilenameWithoutPath>main.c</FilenameWithoutPath>
@@ -762,7 +762,7 @@
 
   <Group>
     <GroupName>MDK-ARM</GroupName>
-    <tvExp>1</tvExp>
+    <tvExp>0</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
@@ -774,8 +774,8 @@
       <Focus>0</Focus>
       <ColumnNumber>0</ColumnNumber>
       <tvExpOptDlg>0</tvExpOptDlg>
-      <TopLine>42</TopLine>
-      <CurrentLine>66</CurrentLine>
+      <TopLine>39</TopLine>
+      <CurrentLine>73</CurrentLine>
       <bDave2>0</bDave2>
       <PathWithFileName>c:\Keil\ARM\Boards\Keil\MCBSTM32F200\RL\FlashFS\SD_File\Serial.c</PathWithFileName>
       <FilenameWithoutPath>Serial.c</FilenameWithoutPath>
@@ -898,7 +898,7 @@
 
   <Group>
     <GroupName>CyaSSL Library</GroupName>
-    <tvExp>1</tvExp>
+    <tvExp>0</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
@@ -1050,7 +1050,7 @@
 
   <Group>
     <GroupName>Crypt/Cipher Library</GroupName>
-    <tvExp>1</tvExp>
+    <tvExp>0</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
@@ -1428,10 +1428,10 @@
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <Focus>0</Focus>
-      <ColumnNumber>0</ColumnNumber>
+      <ColumnNumber>30</ColumnNumber>
       <tvExpOptDlg>0</tvExpOptDlg>
-      <TopLine>0</TopLine>
-      <CurrentLine>0</CurrentLine>
+      <TopLine>560</TopLine>
+      <CurrentLine>570</CurrentLine>
       <bDave2>0</bDave2>
       <PathWithFileName>..\..\..\ctaocrypt\src\random.c</PathWithFileName>
       <FilenameWithoutPath>random.c</FilenameWithoutPath>
@@ -1446,8 +1446,8 @@
       <Focus>0</Focus>
       <ColumnNumber>0</ColumnNumber>
       <tvExpOptDlg>0</tvExpOptDlg>
-      <TopLine>0</TopLine>
-      <CurrentLine>0</CurrentLine>
+      <TopLine>1</TopLine>
+      <CurrentLine>1</CurrentLine>
       <bDave2>0</bDave2>
       <PathWithFileName>..\..\..\ctaocrypt\src\ripemd.c</PathWithFileName>
       <FilenameWithoutPath>ripemd.c</FilenameWithoutPath>
@@ -1538,7 +1538,7 @@
 
   <Group>
     <GroupName>Configuration</GroupName>
-    <tvExp>1</tvExp>
+    <tvExp>0</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
@@ -1678,7 +1678,7 @@
       <Focus>0</Focus>
       <ColumnNumber>0</ColumnNumber>
       <tvExpOptDlg>0</tvExpOptDlg>
-      <TopLine>165</TopLine>
+      <TopLine>163</TopLine>
       <CurrentLine>169</CurrentLine>
       <bDave2>0</bDave2>
       <PathWithFileName>..\MDK-ARM\config\startup_stm32f2xx.s</PathWithFileName>
@@ -1698,7 +1698,7 @@
       <GroupNumber>7</GroupNumber>
       <FileNumber>73</FileNumber>
       <FileType>1</FileType>
-      <tvExp>1</tvExp>
+      <tvExp>0</tvExp>
       <Focus>0</Focus>
       <ColumnNumber>0</ColumnNumber>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -1714,18 +1714,34 @@
       <GroupNumber>7</GroupNumber>
       <FileNumber>74</FileNumber>
       <FileType>1</FileType>
-      <tvExp>1</tvExp>
+      <tvExp>0</tvExp>
       <Focus>0</Focus>
       <ColumnNumber>0</ColumnNumber>
       <tvExpOptDlg>0</tvExpOptDlg>
-      <TopLine>52</TopLine>
-      <CurrentLine>56</CurrentLine>
+      <TopLine>51</TopLine>
+      <CurrentLine>57</CurrentLine>
       <bDave2>0</bDave2>
       <PathWithFileName>..\MDK-ARM\CyaSSL\Retarget.c</PathWithFileName>
       <FilenameWithoutPath>Retarget.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>75</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <Focus>0</Focus>
+      <ColumnNumber>0</ColumnNumber>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <TopLine>0</TopLine>
+      <CurrentLine>0</CurrentLine>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\STM32F2xx_StdPeriph_Lib\time-STM32F2xx.c</PathWithFileName>
+      <FilenameWithoutPath>time-STM32F2xx.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
   </Group>
 
 </ProjectOpt>
diff --git a/IDE/MDK-ARM/Projects/MDK-ARM-STM32F2xx.uvproj b/IDE/MDK-ARM/Projects/MDK-ARM-STM32F2xx.uvproj
index 20def53d7..222ef456f 100644
--- a/IDE/MDK-ARM/Projects/MDK-ARM-STM32F2xx.uvproj
+++ b/IDE/MDK-ARM/Projects/MDK-ARM-STM32F2xx.uvproj
@@ -44,7 +44,7 @@
             <InvalidFlash>1</InvalidFlash>
           </TargetStatus>
           <OutputDirectory>.\MDK-RTX-TCP-FS\</OutputDirectory>
-          <OutputName>MDK-RTX-TCP-FS</OutputName>
+          <OutputName>STM32F2xx-MDK-RTX-TCP-FS</OutputName>
           <CreateExecutable>1</CreateExecutable>
           <CreateLib>0</CreateLib>
           <CreateHexFile>0</CreateHexFile>
@@ -349,7 +349,7 @@
             <uSurpInc>0</uSurpInc>
             <VariousControls>
               <MiscControls></MiscControls>
-              <Define>HAVE_CONFIG_H __DBG_ITM __RTX USE_STDPERIPH_DRIVER MDK_CONF_RTX_TCP_FS</Define>
+              <Define>HAVE_CONFIG_H CYASSL_STM32F2xx __DBG_ITM __RTX USE_STDPERIPH_DRIVER MDK_CONF_RTX_TCP_FS</Define>
               <Undefine></Undefine>
               <IncludePath>..\MDK-ARM\CyaSSL;C:..\STM32F2xx_StdPeriph_Lib\inc;..\..\..\</IncludePath>
             </VariousControls>
@@ -930,6 +930,11 @@
               <FileType>1</FileType>
               <FilePath>..\MDK-ARM\CyaSSL\Retarget.c</FilePath>
             </File>
+            <File>
+              <FileName>time-STM32F2xx.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\STM32F2xx_StdPeriph_Lib\time-STM32F2xx.c</FilePath>
+            </File>
           </Files>
         </Group>
       </Groups>
@@ -972,7 +977,7 @@
             <InvalidFlash>1</InvalidFlash>
           </TargetStatus>
           <OutputDirectory>.\MDK-FS\</OutputDirectory>
-          <OutputName>MDK-FS</OutputName>
+          <OutputName>STM32F2xx-MDK-FS</OutputName>
           <CreateExecutable>1</CreateExecutable>
           <CreateLib>0</CreateLib>
           <CreateHexFile>0</CreateHexFile>
@@ -1277,7 +1282,7 @@
             <uSurpInc>0</uSurpInc>
             <VariousControls>
               <MiscControls></MiscControls>
-              <Define>HAVE_CONFIG_H  __DBG_ITM USE_STDPERIPH_DRIVER  MDK_CONF_FS</Define>
+              <Define>HAVE_CONFIG_H  CYASSL_STM32F2xx __DBG_ITM USE_STDPERIPH_DRIVER  MDK_CONF_FS</Define>
               <Undefine></Undefine>
               <IncludePath>..\MDK-ARM\CyaSSL;..\MDK-ARM\inc;..\STM32F2xx_StdPeriph_Lib\inc;..\POSIX\..\..\..\</IncludePath>
             </VariousControls>
@@ -2134,6 +2139,11 @@
               <FileType>1</FileType>
               <FilePath>..\MDK-ARM\CyaSSL\Retarget.c</FilePath>
             </File>
+            <File>
+              <FileName>time-STM32F2xx.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\STM32F2xx_StdPeriph_Lib\time-STM32F2xx.c</FilePath>
+            </File>
           </Files>
         </Group>
       </Groups>
@@ -2176,7 +2186,7 @@
             <InvalidFlash>1</InvalidFlash>
           </TargetStatus>
           <OutputDirectory>.\MDK-BARE-METAL\</OutputDirectory>
-          <OutputName>MDK-BARE-METAL</OutputName>
+          <OutputName>STM32F2xx-MDK-BARE-METAL</OutputName>
           <CreateExecutable>1</CreateExecutable>
           <CreateLib>0</CreateLib>
           <CreateHexFile>0</CreateHexFile>
@@ -2481,7 +2491,7 @@
             <uSurpInc>0</uSurpInc>
             <VariousControls>
               <MiscControls></MiscControls>
-              <Define>HAVE_CONFIG_H  __DBG_ITM USE_STDPERIPH_DRIVER MDK_CONF_BARE_METAL</Define>
+              <Define>HAVE_CONFIG_H  CYASSL_STM32F2xx  __DBG_ITM USE_STDPERIPH_DRIVER MDK_CONF_BARE_METAL</Define>
               <Undefine></Undefine>
               <IncludePath>..\MDK-ARM\CyaSSL;..\MDK-ARM\inc;..\STM32F2xx_StdPeriph_Lib\inc;..\POSIX;..\..\..\</IncludePath>
             </VariousControls>
@@ -3556,6 +3566,11 @@
               <FileType>1</FileType>
               <FilePath>..\MDK-ARM\CyaSSL\Retarget.c</FilePath>
             </File>
+            <File>
+              <FileName>time-STM32F2xx.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\STM32F2xx_StdPeriph_Lib\time-STM32F2xx.c</FilePath>
+            </File>
           </Files>
         </Group>
       </Groups>
diff --git a/ctaocrypt/src/random.c b/ctaocrypt/src/random.c
index 05daae965..8b3633ad4 100644
--- a/ctaocrypt/src/random.c
+++ b/ctaocrypt/src/random.c
@@ -567,7 +567,7 @@ int GenerateSeed(OS_Seed* os, byte* output, word32 sz)
 
         return 0;
     }
-#elif defined(CYASSL_LPC43xx)
+#elif defined(CYASSL_LPC43xx) || defined(CYASSL_STM32F2xx)
     #warning "write a real random seed!!!!, just for testing now"
     int GenerateSeed(OS_Seed* os, byte* output, word32 sz)
     {