Rework solution configuration and ST CMSIS/HAL integration

.gitignore

@@ -31,6 +31,12 @@
 ipch/
 *.VC.db
 
+# Visual Studio Code
+.vscode/*
+!.vscode/settings.json
+!.vscode/tasks.json
+!.vscode/launch.json
+
 !/tools/bin/
 
 #uVision
@@ -53,7 +59,18 @@ ReleaseNotesCrypto.txt
 /Solutions/Windows/TinyCLR/FLASH_MEMORY.bin
 *.opendb
 *.dbgconf
+!STM32Cube/ReadMe.m
 /tools/DisAsmPE/Debug
 /tools/DisAsmPE/DisAsmPE/Debug
 /tools/DisAsmPE/NETMF.PE.Metadata/Debug
 /tools/DisAsmPE/DisAsmPE/*.txt
+
+# STM32 Cube
+STM32Cube/*
+!STM32Cube/ReadMe.m
+
+# CMSIS PAL and HAL folders
+DeviceCode/Targets/Native/*/HAL_Driver
+DeviceCode/Targets/Native/*/USB/STM32_USB_Device_Library
+!DeviceCode/Targets/Native/*.proj
+!DeviceCode/Targets/Native/*.settings

Application/MicroBooter/MicroBooter.cpp

@@ -3,7 +3,7 @@
 //  <No description>
 //
 //  Microsoft dotNetMF Project
-//  Copyright �2004 Microsoft Corporation
+//  Copyright �2004 Microsoft Corporation
 //  One Microsoft Way, Redmond, Washington 98052-6399 U.S.A.
 //  All rights reserved.
 //  MICROSOFT CONFIDENTIAL
@@ -22,7 +22,7 @@ BOOL MemStreamSeekBlockAddress( BlockStorageStream &stream, UINT32 address );
 static SREC_Handler g_SREC;
 #endif
 
-HAL_DECLARE_CUSTOM_HEAP( SimpleHeap_Allocate, SimpleHeap_Release, SimpleHeap_ReAllocate );
+//HAL_DECLARE_CUSTOM_HEAP( SimpleHeap_Allocate, SimpleHeap_Release, SimpleHeap_ReAllocate );
 
 #pragma arm section zidata = "s_SystemStates"
 static INT32 s_SystemStates[SYSTEM_STATE_TOTAL_STATES];
@@ -438,8 +438,8 @@ void BootEntryLoader()
 
     HeapLocation( BaseAddress, SizeInBytes );
 
-    // Initialize custom heap with heap block returned from CustomHeapLocation
-    SimpleHeap_Initialize( BaseAddress, SizeInBytes );
+    //// Initialize custom heap with heap block returned from CustomHeapLocation
+    //SimpleHeap_Initialize( BaseAddress, SizeInBytes );
 
     // this is the place where interrupts are enabled after boot for the first time after boot
     ENABLE_INTERRUPTS();

Application/MicroBooter/SrecProcessor.cpp

@@ -75,15 +75,19 @@ BOOL SREC_Handler::Process( char c )
                         {
                             ApplicationStartAddress str = (ApplicationStartAddress)m_ImageStart;
 
+                            #ifdef FEATURE_LCD
                             LCD_Clear();
+                            #endif
 
                             DebuggerPort_Uninitialize( HalSystemConfig.DebuggerPorts[0] );
 
                             DISABLE_INTERRUPTS();
 
                             LCD_Uninitialize();
 
+                            #ifdef FEATURE_CPUCACHE            
                             CPU_DisableCaches();
+                            #endif
 
                             (*str)();
                         }

Application/TinyBooter/Commands.cpp

@@ -80,7 +80,7 @@ struct BitFieldManager
         {
             const BlockDeviceInfo* deviceInfo = m_blockDevice->GetDeviceInfo();
 
-            data = (BYTE*)private_malloc( m_region->BytesPerBlock );
+            data = (BYTE*)malloc( m_region->BytesPerBlock );
 
             if(data != NULL)
             {
@@ -99,7 +99,7 @@ struct BitFieldManager
                 ConfigurationSector *pCfg = (ConfigurationSector*)data;
                 memset( (void*)&pCfg->SignatureCheck[ 0 ], 0xFF, sizeof(pCfg->SignatureCheck) );
                 m_blockDevice->Write( m_cfgPhysicalAddress, m_region->BytesPerBlock,data, FALSE );
-                private_free(data);
+                free(data);
             }
             else
             {
@@ -140,7 +140,12 @@ struct BitFieldManager
             dataAddr = (volatile FLASH_WORD*)&m_signatureCheck->BitField[ sectorIndex / BITS_PER_UINT32 ];
 
             // read back the 
+
+#ifdef FEATURE_CPUCACHE            
             dataRdAddr = (volatile FLASH_WORD*)CPU_GetUncachableAddress( dataAddr );
+#else
+            dataRdAddr = (volatile FLASH_WORD*)dataAddr;
+#endif            
             data = (*dataRdAddr) & ~( 1ul << (sectorIndex % BITS_PER_UINT32) );
 
             // write directly
@@ -150,7 +155,7 @@ struct BitFieldManager
         else
         {
             UINT32 length  = m_region->BytesPerBlock;
-            BYTE*  dataptr = (BYTE*)private_malloc(length);
+            BYTE*  dataptr = (BYTE*)malloc(length);
 
             if(dataptr != NULL)
             {
@@ -174,7 +179,7 @@ struct BitFieldManager
 
                 // write back to sector, as we only change one bit from 0 to 1, no need to erase sector
                 m_blockDevice->Write( m_cfgPhysicalAddress, length, dataptr, FALSE );
-                private_free(dataptr);
+                free(dataptr);
             }
 
         }     
@@ -227,7 +232,7 @@ struct BitFieldManager
                 UINT32 length = sizeof(ConfigurationSector);
 
                 memset( &m_skipCfgSectorCheck, 0xff, sizeof(m_skipCfgSectorCheck) );
-                data         = (BYTE*)private_malloc(length);
+                data         = (BYTE*)malloc(length);
                 stream.Device->Read( m_cfgPhysicalAddress, length, (BYTE *)data );
                 configSector = (ConfigurationSector*)data;
                 m_signatureCheck = NULL;
@@ -253,13 +258,17 @@ struct BitFieldManager
                     m_signatureCheck = &m_skipCfgSectorCheck;
                 }
 
-                private_free(data);
+                free(data);
 
             }
             else // XIP device
             {
 
+#ifdef FEATURE_CPUCACHE            
                 configSector = (ConfigurationSector*)CPU_GetUncachableAddress( m_cfgPhysicalAddress ); // global config not in flash for bootloader
+#else
+                configSector = (ConfigurationSector*)m_cfgPhysicalAddress; // global config not in flash for bootloader
+#endif
 
                 m_signatureCheck = NULL;
 
@@ -476,7 +485,7 @@ static bool AccessMemory( UINT32 location, UINT32 lengthInBytes, BYTE* buf, int
                     {
                         if (mode == AccessMemory_Check)
                         {
-                            bufPtr = (BYTE*) private_malloc(NumOfBytes);
+                            bufPtr = (BYTE*) malloc(NumOfBytes);
                             if(!bufPtr) return false;
                         }
 
@@ -486,7 +495,7 @@ static bool AccessMemory( UINT32 location, UINT32 lengthInBytes, BYTE* buf, int
                         {
                             if (mode == AccessMemory_Check)
                             {
-                                private_free(bufPtr);
+                                free(bufPtr);
                             }
 
                             break;
@@ -495,7 +504,7 @@ static bool AccessMemory( UINT32 location, UINT32 lengthInBytes, BYTE* buf, int
                         if (mode == AccessMemory_Check)  
                         {
                             *(UINT32*)buf = SUPPORT_ComputeCRC( bufPtr, NumOfBytes, *(UINT32*)buf );
-                            private_free(bufPtr);
+                            free(bufPtr);
                         }
                     }
                     break;
@@ -525,18 +534,18 @@ static bool AccessMemory( UINT32 location, UINT32 lengthInBytes, BYTE* buf, int
                             {
                                  if(g_ConfigBuffer != NULL)
                                  {
-                                     private_free(g_ConfigBuffer);
+                                     free(g_ConfigBuffer);
                                  }
                                  g_ConfigBufferLength = 0;
 
-                                 // g_ConfigBuffer = (UINT8*)private_malloc(pRegion->BytesPerBlock);
+                                 // g_ConfigBuffer = (UINT8*)malloc(pRegion->BytesPerBlock);
                                  // Just allocate the configuration Sector size, configuration block can be large and not necessary to have that buffer.
-                                 g_ConfigBuffer = (UINT8*)private_malloc(g_ConfigBufferTotalSize);
+                                 g_ConfigBuffer = (UINT8*)malloc(g_ConfigBufferTotalSize);
 
                             }
                             else if(g_ConfigBufferTotalSize < ( g_ConfigBufferLength + lengthInBytes))
                             {
-                                UINT8* tmp = (UINT8*)private_malloc(g_ConfigBufferLength + lengthInBytes);
+                                UINT8* tmp = (UINT8*)malloc(g_ConfigBufferLength + lengthInBytes);
 
                                 if(tmp == NULL)
                                 {
@@ -545,7 +554,7 @@ static bool AccessMemory( UINT32 location, UINT32 lengthInBytes, BYTE* buf, int
 
                                 memcpy( tmp, g_ConfigBuffer, g_ConfigBufferLength );
 
-                                private_free(g_ConfigBuffer);
+                                free(g_ConfigBuffer);
 
                                 g_ConfigBuffer = tmp;
                             }
@@ -754,7 +763,7 @@ bool Loader_Engine::SignedDataState::VerifySignature( UINT8* signature, UINT32 l
     const BlockDeviceInfo* deviceInfo = m_pDevice->GetDeviceInfo();
     if(!deviceInfo->Attribute.SupportsXIP)
     {
-        signCheckedAddr = (BYTE*)private_malloc(m_dataLength);
+        signCheckedAddr = (BYTE*)malloc(m_dataLength);
         if (signCheckedAddr == NULL)
         {    
             EraseMemoryAndReset();
@@ -764,7 +773,7 @@ bool Loader_Engine::SignedDataState::VerifySignature( UINT8* signature, UINT32 l
         if(!m_pDevice->Read( m_dataAddress, m_dataLength, signCheckedAddr ))
         {    
             EraseMemoryAndReset();
-            private_free(signCheckedAddr);
+            free(signCheckedAddr);
 
             return false;
         }
@@ -791,7 +800,7 @@ bool Loader_Engine::SignedDataState::VerifySignature( UINT8* signature, UINT32 l
 
     if(!deviceInfo->Attribute.SupportsXIP)
     {
-        private_free(signCheckedAddr);
+        free(signCheckedAddr);
     }
 
     return fret;
@@ -1076,7 +1085,9 @@ void Loader_Engine::Launch( ApplicationStartAddress startAddress )
     if (retAddress != NULL)
         startAddress = retAddress;
 
+    #ifdef FEATURE_LCD
     LCD_Clear();
+    #endif
 
     DebuggerPort_Flush( m_port );
 
@@ -1089,9 +1100,13 @@ void Loader_Engine::Launch( ApplicationStartAddress startAddress )
 
     DISABLE_INTERRUPTS();
 
+    #ifdef FEATURE_LCD
     LCD_Uninitialize();
+    #endif
 
+    #ifdef FEATURE_CPUCACHE            
     CPU_DisableCaches();
+    #endif
 
     if(Tinybooter_ImageIsCompressed())
     {
@@ -1426,8 +1441,8 @@ bool Loader_Engine::Monitor_MemoryMap( WP_Message* msg )
     map[ 0 ].m_length  = HalSystemConfig.RAM1.Size;
     map[ 0 ].m_flags   = CLR_DBG_Commands::Monitor_MemoryMap::c_RAM;
 
-    map[ 1 ].m_address = HalSystemConfig.FLASH.Base;
-    map[ 1 ].m_length  = HalSystemConfig.FLASH.Size;
+    map[ 1 ].m_address = HalSystemConfig.FLASH1.Base;
+    map[ 1 ].m_length  = HalSystemConfig.FLASH1.Size;
     map[ 1 ].m_flags   = CLR_DBG_Commands::Monitor_MemoryMap::c_FLASH;
 
     ReplyToCommand( msg, true, false, map, sizeof(map) );
@@ -1542,7 +1557,7 @@ bool Loader_Engine::Monitor_FlashSectorMap( WP_Message* msg )
 
         if(cnt == 1)
         {
-            pData = (struct Flash_Sector*)private_malloc(rangeCount * sizeof(struct Flash_Sector));
+            pData = (struct Flash_Sector*)malloc(rangeCount * sizeof(struct Flash_Sector));
 
             if(pData == NULL)
             {
@@ -1582,7 +1597,7 @@ bool Loader_Engine::Monitor_FlashSectorMap( WP_Message* msg )
 
     ReplyToCommand(msg, true, false, (void*)pData, rangeCount * sizeof (struct Flash_Sector) );
 
-    private_free(pData);
+    free(pData);
 
     return true;
 }

Application/TinyBooter/ConfigurationManager.cpp

@@ -38,7 +38,11 @@ void ConfigurationSectorManager::LocateConfigurationSector( UINT32 BlockUsage )
             m_fSupportsXIP = TRUE;
             m_fUsingRAM = FALSE;
             // Get the real address 
+#ifdef FEATURE_CPUCACHE            
             m_configurationSector = (ConfigurationSector *)CPU_GetUncachableAddress( m_cfgPhysicalAddress );
+#else
+            m_configurationSector = (ConfigurationSector *)m_cfgPhysicalAddress;
+#endif            
         }
         else
         {
@@ -74,7 +78,11 @@ void ConfigurationSectorManager::LoadConfiguration()
     if (m_fSupportsXIP)
     {
         // Get the real address 
+#ifdef FEATURE_CPUCACHE            
         m_configurationSector = (ConfigurationSector *)CPU_GetUncachableAddress( m_cfgPhysicalAddress );
+#else
+        m_configurationSector = (ConfigurationSector *)m_cfgPhysicalAddress;
+#endif        
         return ;
 
     }
@@ -130,7 +138,7 @@ void ConfigurationSectorManager::WriteConfiguration( UINT32 writeOffset, BYTE *d
     // Copy the whole block to a buffer, for NonXIP or need to erase block
     if ((eraseWrite) || (!m_fSupportsXIP))
     {        
-        configurationInBytes =(BYTE*)private_malloc(writeLengthInBytes);
+        configurationInBytes =(BYTE*)malloc(writeLengthInBytes);
 
         // load data to the local buffer.
         if (configurationInBytes)
@@ -154,7 +162,7 @@ void ConfigurationSectorManager::WriteConfiguration( UINT32 writeOffset, BYTE *d
         // rewrite from the start of block
         m_device->Write( m_cfgPhysicalAddress, writeLengthInBytes, configurationInBytes, FALSE ); 
 
-        private_free(configurationInBytes);
+        free(configurationInBytes);
 
 
     }

Application/TinyBooter/CryptoInterface.cpp

@@ -10,7 +10,11 @@ extern int g_ConfigBufferLength;
 
 CryptoState::CryptoState( UINT32 dataAddress, UINT32 dataLength, BYTE* sig, UINT32 sigLength, UINT32 sectorType ) : 
 #if defined(ARM_V1_2)
+#ifdef FEATURE_CPUCACHE            
     m_dataAddress( CPU_GetCachableAddress( dataAddress ) ),
+#else
+    m_dataAddress(dataAddress),
+#endif
 #else
     m_dataAddress( dataAddress    ),
 #endif
@@ -111,7 +115,7 @@ bool CryptoState::VerifySignature( UINT32 keyIndex )
             }
 
             // free RAM buffer
-            private_free(g_ConfigBuffer);
+            free(g_ConfigBuffer);
             g_ConfigBuffer = NULL;
 
             return fRet;

Application/TinyBooter/TinyBooter.cpp

@@ -16,11 +16,11 @@ extern bool WaitForTinyBooterUpload( INT32 &timeout_ms );
 
 Loader_Engine g_eng;
 
-//--//
+// //--//
 
-HAL_DECLARE_CUSTOM_HEAP( SimpleHeap_Allocate, SimpleHeap_Release, SimpleHeap_ReAllocate );
+// HAL_DECLARE_CUSTOM_HEAP( SimpleHeap_Allocate, SimpleHeap_Release, SimpleHeap_ReAllocate );
 
-//--//
+// //--//
 
 void ApplicationEntryPoint()
 {
@@ -32,7 +32,6 @@ void ApplicationEntryPoint()
     UINT32 SizeInBytes;                                 
 
     HeapLocation         ( BaseAddress, SizeInBytes );  
-    SimpleHeap_Initialize( BaseAddress, SizeInBytes );  
 
     g_eng.Initialize( HalSystemConfig.DebuggerPorts[ 0 ] );
 
@@ -55,8 +54,10 @@ void ApplicationEntryPoint()
 
     if(enterBootMode)
     {
+#ifdef FEATURE_LCD
         LCD_Clear();
-
+#endif
+
         hal_fprintf( STREAM_LCD, "TinyBooter v%d.%d.%d.%d\r\n", VERSION_MAJOR, VERSION_MINOR, VERSION_BUILD, VERSION_REVISION);
         hal_fprintf( STREAM_LCD, "%s Build Date:\r\n\t%s %s\r\n", HalName, __DATE__, __TIME__ );