Adding NoNet project to MCBSTM32F400

Author: smaillet-ms

Solutions/MCBSTM32F400/DeviceCode/Initialization/tinyhal.cpp

@@ -124,7 +124,7 @@ static void __section("SectionForBootstrapOperations") Prepare_Zero( UINT32* dst
     }
 }
 
-#if !defined(PLATFORM_ARM_OS_PORT)
+#if !defined(PLATFORM_ARM_OS_PORT) || defined(__GNUC__)
 void __section("SectionForBootstrapOperations") PrepareImageRegions()
 {
     //
@@ -327,7 +327,7 @@ void HAL_Initialize()
     // a soft reboot.
     __enable_irq();
 #endif
-	
+
     HAL_CONTINUATION::InitializeList();
     HAL_COMPLETION  ::InitializeList();
 
@@ -510,25 +510,28 @@ void HAL_Uninitialize()
 #endif
 }
 
-#if !defined(PLATFORM_ARM_OS_PORT)
 extern "C"
 {
+#if defined( __GNUC__ )
+    extern "C++" int main(void);
+    extern void __libc_init_array();
+    void __main()
+    {
+        // Copy writeable data and zero init BSS
+        PrepareImageRegions();
 
-void BootEntry()
-{
-#if (defined(GCCOP) && defined(COMPILE_THUMB))
-
-// the IRQ_Handler routine generated from the compiler is incorrect, the return address LR has been decrement twice
-// it decrements LR at the first instruction of IRQ_handler and then before return, it decrements LR again.
-// temporary fix is at the ARM_Vector ( IRQ), make it jump to 2nd instruction of IRQ_handler to skip teh first subs LR, LR #4;
-//
-    volatile int *ptr;
-    ptr =(int*) 0x28;
-    *ptr = *ptr +4;
-#endif
+        // Call static constructors
+        __libc_init_array();
 
+        // Call the application's entry point.
+        main();
+    }
+#endif
 
-#if !defined(BUILD_RTM) && !defined(PLATFORM_ARM_OS_PORT)
+#if !defined(PLATFORM_ARM_OS_PORT)
+void BootEntry()
+{
+#if !defined(BUILD_RTM)
     {
         int  marker;
         int* ptr = &marker - 1; // This will point to the current top of the stack.
@@ -620,10 +623,10 @@ void BootEntry()
     CPU_Halt();
 #endif
 }
+#endif
 
 } // extern "C"
 
-#endif
 
 #if defined(PLATFORM_ARM_OS_PORT)
 extern "C" void STM32F4_BootstrapCode();
@@ -683,8 +686,6 @@ void lcd_printf( const char* format, ... )
 
 #endif  // !defined(BUILD_RTM)
 
-//--//
-
 #if !defined(BUILD_RTM)
 
 UINT32 Checksum_RAMConstants()

Solutions/MCBSTM32F400/MCBSTM32F400.settings

@@ -13,7 +13,6 @@
         <IsSolutionWizardVisible>True</IsSolutionWizardVisible>
         <ENDIANNESS>le</ENDIANNESS>
         <NO_BOOTLOADER_COMPRESSION>true</NO_BOOTLOADER_COMPRESSION>
-        <TCP_IP_STACK>LWIP_1_4_1_OS</TCP_IP_STACK>
     </PropertyGroup>
     <PropertyGroup>
         <OEMSystemInfoString>Copyright (C) Microsoft Open Technologies Inc.</OEMSystemInfoString>
@@ -24,5 +23,5 @@
     </ItemGroup>
     <Import Project="$(SPOCLIENT)\devicecode\Targets\Native\STM32F4\STM32F4.settings" />
     <!-- This must be imported after the native build settings as it overrides the TARGETCODEBASE and Target type-->
-    <Import Project="$(SPOCLIENT)\devicecode\Targets\OS\CMSIS_RTOS\CMSIS_RTOS.settings" Condition="'$(reducesize)' == 'false'"/>
+    <Import Project="$(SPOCLIENT)\devicecode\Targets\OS\CMSIS_RTOS\CMSIS_RTOS.settings" Condition="'$(reducesize)' == 'false' AND '$(TCP_IP_STACK)'=='LWIP_1_4_1_OS'"/>
 </Project>

Solutions/MCBSTM32F400/TinyBooter/TinyBooter.proj

@@ -43,8 +43,8 @@
         <RequiredProjects Include="$(SPOCLIENT)\DeviceCode\Cores\arm\Processors\CortexMx\GlobalLock\dotNetMF.proj" />
     </ItemGroup>
     <ItemGroup>
-        <DriverLibs Include="MCBSTM32F400_tinyhal_loader.$(LIB_EXT)" />
-        <RequiredProjects Include="$(SPOCLIENT)\Solutions\MCBSTM32F400\DeviceCode\TinyHal\dotNetMF_loader.proj" />
+        <DriverLibs Include="TinyHal_loader_Cortex.$(LIB_EXT)"/>
+        <RequiredProjects Include="$(SPOCLIENT)\DeviceCode\Cores\arm\Processors\CortexMx\TinyHal\dotnetmf_loader.proj" />
     </ItemGroup>
     <ItemGroup>
         <DriverLibs Include="cpu_prestackinit_stubs.$(LIB_EXT)" />
@@ -99,8 +99,8 @@
         <RequiredProjects Include="$(SPOCLIENT)\DeviceCode\Drivers\stubs\Processor\stubs_watchdog\dotNetMF.proj" />
     </ItemGroup>
     <ItemGroup>
-        <DriverLibs Include="MCBSTM32F400_initialization_hal_loader.$(LIB_EXT)" />
-        <RequiredProjects Include="$(SPOCLIENT)\Solutions\MCBSTM32F400\DeviceCode\Initialization\dotNetMF_loader.proj" />
+        <DriverLibs Include="system_initialization_hal_loader.$(LIB_EXT)" />
+        <RequiredProjects Include="$(SPOCLIENT)\DeviceCode\Initialization\dotNetMF_loader.proj" />
     </ItemGroup>
     <ItemGroup>
         <DriverLibs Include="Watchdog_pal_stubs.$(LIB_EXT)" />
@@ -246,11 +246,11 @@
         <DriverLibs Include="STM32F4_DA.$(LIB_EXT)" />
         <RequiredProjects Include="$(SPOCLIENT)\DeviceCode\Targets\Native\STM32F4\DeviceCode\STM32F4_DA\dotNetMF.proj" />
     </ItemGroup>
-	<ItemGroup>
+    <ItemGroup>
         <DriverLibs Include="M29W640FB_Flash.$(LIB_EXT)" />
         <RequiredProjects Include="$(SPOCLIENT)\Solutions\MCBSTM32F400\DeviceCode\M29W640FB_Flash\dotNetMF.proj" />
     </ItemGroup>
-	<ItemGroup>
+    <ItemGroup>
         <DriverLibs Include="M29W640FB_blconfig_MCBSTM32F400.$(LIB_EXT)" />
         <RequiredProjects Include="$(SPOCLIENT)\Solutions\MCBSTM32F400\DeviceCode\Blockstorage\M29W640FB\dotNetMF.proj" />
     </ItemGroup>

Solutions/MCBSTM32F400/TinyBooter/TinyBooterEntry.cpp

@@ -20,6 +20,7 @@
 // boot loader doesn't use the CMSIS-RTOS kernel, so sleep goes direct
 // to the low level support
 extern void HAL_CPU_Sleep( SLEEP_LEVEL level, UINT64 wakeEvents );
+
 void CPU_Sleep( SLEEP_LEVEL level, UINT64 wakeEvents )
 {
     HAL_CPU_Sleep( level, wakeEvents );

Solutions/MCBSTM32F400/TinyBooter/scatterfile_bootloader_gcc.xml

@@ -36,7 +36,7 @@
     <!-- Put Stack in CCM for high speed access, reducing overhead of stack usage -->
     <Set Name="Stack_Bottom"            Value="%CCM_BaseAddress%"/>
     <Set Name="Stack_Size"              Value="%CCM_Size%" />
-    
+
     <!-- External SRAM -->
     <Set Name="Heap_BaseAddress"        Value="%EXTRAM_BaseAddress%"/>
 
@@ -53,10 +53,10 @@
     <Set Name="Data_BaseAddress"        Value="%Config_BaseAddress% + %Config_Size%"/>
     <Set Name="Data_Size"               Value="0x00020000"/><!-- 128KB -->
 
-    <!-- [Deployment fills the rest of external NOR flash..]. -->
+    <!-- [Deployment fills the rest of external NOR flash...] -->
 
     <!-- Internal FLASH -->
-    <!-- TinyBooter sits at power on Reset vector-->
+    <!-- TinyBooter sits at power on Reset vector -->
     <Set Name="BooterCode_BaseAddress"  Value="%IFLASH_BaseAddress%"/>
     <Set Name="BooterCode_Size"         Value="0x00010000"/><!-- 64KB -->
 
@@ -92,24 +92,23 @@
     <If Name="Valid" Value="false">
         <Error Message="Configuration not recognized"/>
     </If>
-    
+
     <EntryPoint Name="EntryPoint" />
 
     <NamedGroup Name="MEMORY">
         <LoadRegion Name="D_CCM" Base="%CCM_BaseAddress%" Size="%CCM_Size%" />
-        <LoadRegion Name="IRAM" Base="%IRAM_BaseAddress%" Size="%IRAM_Size%"/>
-        <LoadRegion Name="LR_%TARGETLOCATION%" Base="%Code_BaseAddress%" Size="%Code_Size%"/>
+        <LoadRegion Name="IRAM" Base="%IRAM_BaseAddress%" Size="%IRAM_Size%" />
+        <LoadRegion Name="LR_%TARGETLOCATION%" Base="%Code_BaseAddress%" Size="%Code_Size%" />
         <LoadRegion Name="EXTRAM" Base="%EXTRAM_BaseAddress%" Size="%EXTRAM_Size%" />
-        <LoadRegion Name="CONFIG" Base="%Config_BaseAddress%" Size="%Config_Size%"/>
     </NamedGroup>
-    
+
     <NamedGroup Name="SECTIONS">
         <!-- ========= INTERNAL FLASH ============================================ -->
         <ExecRegion Name="ER_%TARGETLOCATION%" Options="&gt;LR_%TARGETLOCATION%">
-            <FileMapping Name="*" Options="(i.EntryPoint)" />
+            <FileMapping Name="KEEP" Options="(*(SectionForPowerOnReset))" />
             <FileMapping Name="*" Options="(SectionForBootstrapOperations)" />
+            <FileMapping Name="*" Options="(SectionForFlashOperations)"/>
             <FileMapping Name="*" Options="(.text*)" />
-            <FileMapping Name="*" Options="(i.*)" />
             <FileMapping Name="*" Options="(.rodata*)" />
             <FileMapping Name="*" Options="(rodata)" />
             <FileMapping Name="*" Options="(.constdata*)" />
@@ -119,65 +118,75 @@
         </ExecRegion>
 
         <!-- ========= INTERNAL RAM ============================================= -->
-        <ExecRegion Name="ER_RAM_RW" Align="0x10" Options="&gt;IRAM AT&gt;LR_%TARGETLOCATION%">
+        <!-- Writeable Vector table -->
+        <!-- NOTE:
+             Despite what you might hope for, this CANNOT go into the CCM area as the NVIC does not
+             have access to that space (it sees the AHB layer and below, rather than the core's D-Bus)
+        -->
+        <!-- Alignment for the vector table is important to allow the NVIC to decode the proper locations
+            (See Section 4.4.4 of the ARM Cortex-M4 Generic User Guide [ ARM DUI 0553A (ID121610) ] )
+            Since this starts the SRAM block, it's aligned just fine for any size table.
+        -->
+        <ExecRegion Name="ER_RAM_RW" Align="0x10" Options="&gt;IRAM AT&gt;LR_FLASH ">
+            <FileMapping Name="*" Options="(VectorTable)"/>
             <FileMapping Name="*" Options="(rwdata)" />
             <FileMapping Name="*" Options="(.data*)" />
         </ExecRegion>
 
-        <ExecRegion Name="ER_RAM_RO" Align="0x10">
-             <!--Flash programming from Flash is safe on STM32 
-             No need to place Flash programming code in RAM--> 
+        <ExecRegion Name="ER_RAM_RO" Align="0x10" Options="&gt;IRAM">
+            <!-- Flash programming from Flash is safe on STM32 -->
+            <!-- No need to place Flash programming code in RAM -->
+            <!-- <FileMapping Name="*" Options="(SectionForFlashOperations)" /> -->
         </ExecRegion>
 
-        <ExecRegion Name=".bss" Align="0x10" Options="&gt;IRAM AT&gt;LR_%TARGETLOCATION%">
+        <ExecRegion Name=".bss" Align="0x10" Base="(NOLOAD)" Options="&gt;IRAM">
             <FileMapping Name="*" Options="(.bss*)" />
-            <FileMapping Name="*" Options="(.zidata*)" />
             <FileMapping Name="PROVIDE(__exidx_start = .);" />
             <FileMapping Name="PROVIDE(__exidx_end = .);" />
-            <FileMapping Name="*" Options="(g_SSL_SeedData)" />
+            <FileMapping Name="*" Options="(.zidata*)" />
+            <FileMapping Name="*" Options="(COMMON)" />
         </ExecRegion>
 
         <ExecRegion Name="/DISCARD/">
             <FileMapping Name="*" Options="(.ARM.exidx*)" />
             <FileMapping Name="*" Options="(.ARM.extab*)" />
         </ExecRegion>
-        
-         <!--========= EXTERNAL RAM =============================================--> 
+
+        <!--========= EXTERNAL RAM =============================================--> 
         <ExecRegion Name="ER_HEAP_BEGIN" Options="&gt;EXTRAM">
             <FileMapping Name="*" Options="(SectionForHeapBegin)" />
         </ExecRegion>
 
         <!-- everything between heapbegin and heapend will be allocated for a heap -->
 
-        <ExecRegion Name="ER_HEAP_END" Base="%Heap_BaseAddress% + %Heap_Size%" Options="&gt;EXTRAM" >
+        <ExecRegion Name="ER_HEAP_END" Base="ADDR(ER_HEAP_BEGIN) + %Heap_Size%" Options="&gt;EXTRAM" >
             <FileMapping Name="*" Options="(SectionForHeapEnd)" />
         </ExecRegion>
 
-        <!--<ExecRegion Name="ER_CUSTOM_HEAP_BEGIN" Base="+0">
+        <ExecRegion Name="ER_CUSTOM_HEAP_BEGIN" Options="&gt;EXTRAM" >
             <FileMapping Name="*" Options="(SectionForCustomHeapBegin)" />
-        </ExecRegion>-->
+        </ExecRegion>
 
-        <!-- everything between heapbegin and heapend will be allocated for the unmanaged SimpleHeap --><!--
+        <!-- everything between heapbegin and heapend will be allocated for the unmanaged SimpleHeap -->
 
-        <ExecRegion Name="ER_CUSTOM_HEAP_END" Base="+%CustomHeap_Size%" Options="ABSOLUTE UNINIT" Size="">
+        <ExecRegion Name="ER_CUSTOM_HEAP_END" Base="ADDR(ER_CUSTOM_HEAP_BEGIN) + %CustomHeap_Size%" Options="&gt;EXTRAM" >
             <FileMapping Name="*" Options="(SectionForCustomHeapEnd)" />
         </ExecRegion>
 
-        --><!-- ========= Internal CCM ============================================ --><!--
-        <ExecRegion Name="ER_STACK_BOTTOM" Base="%Stack_Bottom%" Options="ABSOLUTE UNINIT" Size="">
+        <!-- ========= Internal CCM ============================================ -->
+        <ExecRegion Name="ER_STACK_BOTTOM" Options="&gt;D_CCM">
             <FileMapping Name="*" Options="(SectionForStackBottom)" />
         </ExecRegion>
 
-        --><!-- -8 for the two 32bit values in the SectionForStack* sections, This keeps the region
-             limit from exceeding the size of physical memory.
-        --><!--
-        <ExecRegion Name="ER_STACK_TOP" Base="AlignExpr(+%CCM_Size% -8, 8 )" Options="ABSOLUTE UNINIT" Size="">
+        <!--8 for the two 32bit values in the SectionForStack* sections, This keeps the region
+             limit from exceeding the size of physical memory. -->
+        <ExecRegion Name="ER_STACK_TOP" Base="%Stack_Bottom% + %Stack_Size% - 8" Options="&gt;D_CCM">
             <FileMapping Name="*" Options="(SectionForStackTop +LAST)" />
-        </ExecRegion>-->
+        </ExecRegion>
     </NamedGroup>
 
     <!-- The following variables are used to simulate the ones autogenerated by ARMCC -->
-    <GlobalVariable Name="Load$$ER_%TARGETLOCATION%$$Base"          Value="ADDR(ER_%TARGETLOCATION%)"/>
+    <GlobalVariable Name="Load$$ER_%TARGETLOCATION%$$Base"          Value="LOADADDR(ER_%TARGETLOCATION%)"/>
     <GlobalVariable Name="Image$$ER_%TARGETLOCATION%$$Length"       Value="SIZEOF(ER_%TARGETLOCATION%)"/>
     <GlobalVariable Name="Image$$ER_RAM_RO$$Base"                   Value="ADDR(ER_RAM_RO)"/>
     <GlobalVariable Name="Image$$ER_RAM_RO$$Length"                 Value="SIZEOF(ER_RAM_RO)"/>
@@ -189,3 +198,4 @@
     <GlobalVariable Name="Image$$ER_RAM_RW$$ZI$$Length"             Value="SIZEOF(.bss)"/>
     <GlobalVariable Name="__use_no_semihosting_swi"                 Value="0"/>
 </ScatterFile>
+

Solutions/MCBSTM32F400/TinyBooter/scatterfile_bootloader_mdk.xml

@@ -95,14 +95,24 @@
 
         <!-- ========= INTERNAL FLASH ============================================ -->
         <ExecRegion Name="ER_%TARGETLOCATION%" Base="%Code_BaseAddress%" Options="FIXED" Size="">
-            <FileMapping Name="FirstEntry.obj"   Options="(+RO, +FIRST)" />
+            <FileMapping Name="*" Options="(SectionForPowerOnReset, +FIRST)" />
             <FileMapping Name="*" Options="(SectionForBootstrapOperations)" />
             <FileMapping Name="*" Options="(+RO-CODE)" />
             <FileMapping Name="*" Options="(+RO-DATA)" />
         </ExecRegion>
 
         <!-- ========= INTERNAL RAM ============================================= -->
+        <!-- Writeable Vector table -->
+        <!-- NOTE:
+             Despite what you might hope for, this CANNOT go into the CCM area as the NVIC does not
+             have access to that space (it sees the AHB layer and below, rather than the core's D-Bus)
+        -->
+        <!-- Alignment for the vector table is important to allow the NVIC to decode the proper locations
+            (See Section 4.4.4 of the ARM Cortex-M4 Generic User Guide [ ARM DUI 0553A (ID121610) ] )
+            Since this starts the SRAM block, it's aligned just fine for any size table.
+        -->
         <ExecRegion Name="ER_RAM_RW" Base="%IRAM_BaseAddress%" Options="ABSOLUTE" Size="">
+            <FileMapping Name="*" Options="(VectorTable)"/> 
             <FileMapping Name="*" Options="(+RW-DATA, +ZI)" />
         </ExecRegion>
 

Solutions/MCBSTM32F400/TinyCLR/TinyCLR.proj

@@ -13,6 +13,7 @@
         <MFSettingsFile>$(SPOCLIENT)\Solutions\MCBSTM32F400\MCBSTM32F400.settings</MFSettingsFile>
         <IsSolutionWizardVisible>True</IsSolutionWizardVisible>
         <reducesize>false</reducesize>
+        <TCP_IP_STACK>LWIP_1_4_1_OS</TCP_IP_STACK>
     </PropertyGroup>
     <Import Project="$(SPOCLIENT)\tools\targets\Microsoft.SPOT.System.Settings" />
     <Import Project="$(SPOCLIENT)\tools\Targets\Microsoft.SPOT.Build.Targets" />
@@ -497,7 +498,7 @@
         <DriverLibs Include="M29W640FB_Flash.$(LIB_EXT)" />
         <RequiredProjects Include="$(SPOCLIENT)\Solutions\MCBSTM32F400\DeviceCode\M29W640FB_Flash\dotNetMF.proj" />
     </ItemGroup>
-	<ItemGroup>
+    <ItemGroup>
         <DriverLibs Include="M29W640FB_blconfig_MCBSTM32F400.$(LIB_EXT)" />
         <RequiredProjects Include="$(SPOCLIENT)\Solutions\MCBSTM32F400\DeviceCode\Blockstorage\M29W640FB\dotNetMF.proj" />
     </ItemGroup>