Add target and platform name to NFReleaseInfo (#1379)

***NO_CI***
nanoframework · Jun 20, 2019 · 7a6bf2e · 7a6bf2e
1 parent ac383df
commit 7a6bf2e
Show file tree

Hide file tree

Showing 21 changed files with 164 additions and 42 deletions.
diff --git a/src/CLR/Core/Core-vs2019.vcxproj b/src/CLR/Core/Core-vs2019.vcxproj
@@ -163,7 +163,7 @@
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;VERSION_MAJOR=0;VERSION_MINOR=0;VERSION_BUILD=0;VERSION_REVISION=0;OEMSYSTEMINFOSTRING="WIN_32";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;VERSION_MAJOR=0;VERSION_MINOR=0;VERSION_BUILD=0;VERSION_REVISION=0;OEMSYSTEMINFOSTRING="WIN_32";TARGETNAMESTRING="CLR_WIN32";PLATFORMNAMESTRING="WIN32";%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>..\..\..\targets\os\win32\Include;..\Include;..\CorLib;..\..\HAL\Include;..\..\PAL\Include</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
@@ -188,7 +188,7 @@
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;VERSION_MAJOR=0;VERSION_MINOR=0;VERSION_BUILD=0;VERSION_REVISION=0;OEMSYSTEMINFOSTRING="WIN_32";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;VERSION_MAJOR=0;VERSION_MINOR=0;VERSION_BUILD=0;VERSION_REVISION=0;OEMSYSTEMINFOSTRING="WIN_32";TARGETNAMESTRING="CLR_WIN32";PLATFORMNAMESTRING="WIN32";%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>..\..\..\targets\os\win32\Include;..\Include;..\CorLib;..\..\HAL\Include;..\..\PAL\Include</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>

diff --git a/src/CLR/Core/Core.vcxproj b/src/CLR/Core/Core.vcxproj
@@ -162,7 +162,7 @@
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;VERSION_MAJOR=0;VERSION_MINOR=0;VERSION_BUILD=0;VERSION_REVISION=0;OEMSYSTEMINFOSTRING="WIN_32";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;VERSION_MAJOR=0;VERSION_MINOR=0;VERSION_BUILD=0;VERSION_REVISION=0;OEMSYSTEMINFOSTRING="WIN_32";TARGETNAMESTRING="CLR_WIN32";PLATFORMNAMESTRING="WIN32";%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>..\..\..\targets\os\win32\Include;..\Include;..\CorLib;..\..\HAL\Include;..\..\PAL\Include</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
@@ -187,7 +187,7 @@
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;VERSION_MAJOR=0;VERSION_MINOR=0;VERSION_BUILD=0;VERSION_REVISION=0;OEMSYSTEMINFOSTRING="WIN_32";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;VERSION_MAJOR=0;VERSION_MINOR=0;VERSION_BUILD=0;VERSION_REVISION=0;OEMSYSTEMINFOSTRING="WIN_32";TARGETNAMESTRING="CLR_WIN32";PLATFORMNAMESTRING="WIN32";%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>..\..\..\targets\os\win32\Include;..\Include;..\CorLib;..\..\HAL\Include;..\..\PAL\Include</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>

diff --git a/src/CLR/Debugger/Debugger.cpp b/src/CLR/Debugger/Debugger.cpp
@@ -1070,7 +1070,19 @@ bool CLR_DBG_Debugger::Debugging_Execution_ChangeConditions( WP_Message* msg)
 
 static void GetClrReleaseInfo(CLR_DBG_Commands::Debugging_Execution_QueryCLRCapabilities::ClrInfo& clrInfo)
 {
-    NFReleaseInfo::Init( clrInfo.m_clrReleaseInfo, VERSION_MAJOR, VERSION_MINOR, VERSION_BUILD, VERSION_REVISION, OEMSYSTEMINFOSTRING, hal_strlen_s(OEMSYSTEMINFOSTRING) );
+    NFReleaseInfo::Init( 
+        clrInfo.m_clrReleaseInfo, 
+        VERSION_MAJOR, 
+        VERSION_MINOR, 
+        VERSION_BUILD, 
+        VERSION_REVISION, 
+        OEMSYSTEMINFOSTRING, 
+        hal_strlen_s(OEMSYSTEMINFOSTRING),
+        TARGETNAMESTRING,
+        hal_strlen_s(TARGETNAMESTRING),
+        PLATFORMNAMESTRING,
+        hal_strlen_s(PLATFORMNAMESTRING)
+        );
 
     if ( g_CLR_RT_TypeSystem.m_assemblyMscorlib &&
          g_CLR_RT_TypeSystem.m_assemblyMscorlib->m_header)
@@ -1087,18 +1099,6 @@ static void GetClrReleaseInfo(CLR_DBG_Commands::Debugging_Execution_QueryCLRCapa
     }
 }
 
-
-void NFReleaseInfo::Init(NFReleaseInfo& NFReleaseInfo, unsigned short int major, unsigned short int minor, unsigned short int build, unsigned short int revision, const char *info, size_t infoLen)
-{
-    NFVersion::Init( NFReleaseInfo.Version, major, minor, build, revision );
-    NFReleaseInfo.InfoString[ 0 ] = 0;
-    if ( NULL != info && infoLen > 0 )
-    {
-        const size_t len = MIN(infoLen, sizeof(NFReleaseInfo.InfoString)-1);
-        hal_strncpy_s( (char*)&NFReleaseInfo.InfoString[ 0 ], sizeof(NFReleaseInfo.InfoString), info, len );
-    }
-}
-
 static bool GetInteropNativeAssemblies( uint8_t* &data, int* size)
 {
     extern const CLR_RT_NativeAssemblyData *g_CLR_InteropAssembliesNativeData[];

diff --git a/src/CLR/Debugger/Debugger.vcxproj b/src/CLR/Debugger/Debugger.vcxproj
@@ -28,6 +28,9 @@
       <Private>false</Private>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
+    <ProjectReference Include="Debugger_stub.vcxproj">
+      <Project>{6dabcbf1-245a-4e76-bd36-8bc300c7dd82}</Project>
+    </ProjectReference>
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{DD397EC4-844B-4B59-A67B-CAD6B46F1F00}</ProjectGuid>
@@ -106,7 +109,7 @@
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;VERSION_MAJOR=0;VERSION_MINOR=0;VERSION_BUILD=0;VERSION_REVISION=0;OEMSYSTEMINFOSTRING="WIN_32";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;VERSION_MAJOR=0;VERSION_MINOR=0;VERSION_BUILD=0;VERSION_REVISION=0;OEMSYSTEMINFOSTRING="WIN_32";TARGETNAMESTRING="CLR_WIN32";PLATFORMNAMESTRING="WIN32";%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>..\..\..\targets\os\win32\Include;..\Include;..\CorLib;..\..\HAL\Include;..\..\PAL\Include</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
@@ -119,7 +122,7 @@
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;_LIB;VERSION_MAJOR=0;VERSION_MINOR=0;VERSION_BUILD=0;VERSION_REVISION=0;OEMSYSTEMINFOSTRING="WIN_32";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_LIB;VERSION_MAJOR=0;VERSION_MINOR=0;VERSION_BUILD=0;VERSION_REVISION=0;OEMSYSTEMINFOSTRING="WIN_32";TARGETNAMESTRING="CLR_WIN32";PLATFORMNAMESTRING="WIN32";%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>..\Include;..\CorLib</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
@@ -134,7 +137,7 @@
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;VERSION_MAJOR=0;VERSION_MINOR=0;VERSION_BUILD=0;VERSION_REVISION=0;OEMSYSTEMINFOSTRING="WIN_32";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;VERSION_MAJOR=0;VERSION_MINOR=0;VERSION_BUILD=0;VERSION_REVISION=0;OEMSYSTEMINFOSTRING="WIN_32";TARGETNAMESTRING="CLR_WIN32";PLATFORMNAMESTRING="WIN32";%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>..\..\..\targets\os\win32\Include;..\Include;..\CorLib;..\..\HAL\Include;..\..\PAL\Include</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>

diff --git a/src/CLR/Debugger/Debugger_stub.cpp b/src/CLR/Debugger/Debugger_stub.cpp
@@ -43,14 +43,31 @@ __nfweak void CLR_DBG_Debugger::BroadcastEvent( unsigned int cmd, unsigned int p
     NATIVE_PROFILE_CLR_DEBUGGER();
 }
 
-__nfweak void NFReleaseInfo::Init( NFReleaseInfo& NFReleaseInfo, unsigned short int major, unsigned short int minor, unsigned short int build, unsigned short int revision, const char *info, size_t infoLen )
+__nfweak void NFReleaseInfo::Init(
+    NFReleaseInfo& NFReleaseInfo, 
+    unsigned short int major, 
+    unsigned short int minor, 
+    unsigned short int build, 
+    unsigned short int revision, 
+    const char *info, 
+    size_t infoLen,
+    const char *target, 
+    size_t targetLen,
+    const char *platform, 
+    size_t platformLen)
 {
     NFVersion::Init( NFReleaseInfo.Version, major, minor, build, revision );
     NFReleaseInfo.InfoString[ 0 ] = 0;
     if ( NULL != info && infoLen > 0 )
     {
-        const size_t len = MIN(infoLen, sizeof(NFReleaseInfo.InfoString)-1);
+        size_t len = MIN(infoLen, sizeof(NFReleaseInfo.InfoString)-1);
         hal_strncpy_s( (char*)&NFReleaseInfo.InfoString[0], sizeof(NFReleaseInfo.InfoString), info, len );
+
+        len = MIN(targetLen, sizeof(NFReleaseInfo.TargetName)-1);
+        hal_strncpy_s( (char*)&NFReleaseInfo.TargetName[0], sizeof(NFReleaseInfo.TargetName), target, len );
+
+        len = MIN(platformLen, sizeof(NFReleaseInfo.PlatformName)-1);
+        hal_strncpy_s( (char*)&NFReleaseInfo.PlatformName[0], sizeof(NFReleaseInfo.PlatformName), platform, len );
     }
 }
 

diff --git a/src/CLR/Runtime.Native/nf_rt_native.cpp b/src/CLR/Runtime.Native/nf_rt_native.cpp
@@ -15,6 +15,8 @@ static const CLR_RT_MethodHandler method_lookup[] =
     Library_nf_rt_native_nanoFramework_Runtime_Native_SystemInfo::get_OEM___STATIC__U1,
     Library_nf_rt_native_nanoFramework_Runtime_Native_SystemInfo::get_Model___STATIC__U1,
     Library_nf_rt_native_nanoFramework_Runtime_Native_SystemInfo::get_SKU___STATIC__U2,
+    Library_nf_rt_native_nanoFramework_Runtime_Native_SystemInfo::get_TargetName___STATIC__STRING,
+    Library_nf_rt_native_nanoFramework_Runtime_Native_SystemInfo::get_PlatformName___STATIC__STRING,
     NULL,
     Library_nf_rt_native_nanoFramework_Runtime_Native_SystemInfo::GetNativeFloatingPointSupport___STATIC__U1,
     NULL,
@@ -46,7 +48,7 @@ static const CLR_RT_MethodHandler method_lookup[] =
 const CLR_RT_NativeAssemblyData g_CLR_AssemblyNative_nanoFramework_Runtime_Native =
 {
     "nanoFramework.Runtime.Native", 
-    0xFE14C7A7,
+    0x783D119F,
     method_lookup,
-    { 1, 0, 4, 4 }
+    { 1, 0, 5, 0 }
 };
diff --git a/src/CLR/Runtime.Native/nf_rt_native.h b/src/CLR/Runtime.Native/nf_rt_native.h
@@ -31,6 +31,8 @@ struct Library_nf_rt_native_nanoFramework_Runtime_Native_SystemInfo
     NANOCLR_NATIVE_DECLARE(get_OEM___STATIC__U1);
     NANOCLR_NATIVE_DECLARE(get_Model___STATIC__U1);
     NANOCLR_NATIVE_DECLARE(get_SKU___STATIC__U2);
+    NANOCLR_NATIVE_DECLARE(get_TargetName___STATIC__STRING);
+    NANOCLR_NATIVE_DECLARE(get_PlatformName___STATIC__STRING);
     NANOCLR_NATIVE_DECLARE(GetNativeFloatingPointSupport___STATIC__U1);
 
     //--//

diff --git a/src/CLR/Runtime.Native/nf_rt_native_nanoFramework_Runtime_Hardware_SystemInfo.cpp b/src/CLR/Runtime.Native/nf_rt_native_nanoFramework_Runtime_Hardware_SystemInfo.cpp
@@ -98,6 +98,32 @@ HRESULT Library_nf_rt_native_nanoFramework_Runtime_Native_SystemInfo::get_SKU___
     NANOCLR_NOCLEANUP();
 }
 
+HRESULT Library_nf_rt_native_nanoFramework_Runtime_Native_SystemInfo::get_TargetName___STATIC__STRING( CLR_RT_StackFrame& stack )
+{
+    NATIVE_PROFILE_CLR_CORE();
+
+    NANOCLR_HEADER();
+
+    NFReleaseInfo releaseInfo;
+
+    Target_GetReleaseInfo( releaseInfo );
+
+    NANOCLR_SET_AND_LEAVE(stack.SetResult_String( (char*)releaseInfo.InfoString ));
+
+    NANOCLR_NOCLEANUP();
+}
+
+HRESULT Library_nf_rt_native_nanoFramework_Runtime_Native_SystemInfo::get_PlatformName___STATIC__STRING( CLR_RT_StackFrame& stack )
+{
+    NATIVE_PROFILE_CLR_CORE();
+
+    NANOCLR_HEADER();
+
+    NANOCLR_SET_AND_LEAVE(stack.NotImplementedStub());
+
+    NANOCLR_NOCLEANUP();
+}
+
 HRESULT Library_nf_rt_native_nanoFramework_Runtime_Native_SystemInfo::GetNativeFloatingPointSupport___STATIC__U1( CLR_RT_StackFrame& stack )
 {
     NANOCLR_HEADER();

diff --git a/src/HAL/Include/nanoHAL_ReleaseInfo.h b/src/HAL/Include/nanoHAL_ReleaseInfo.h
@@ -30,9 +30,23 @@ struct __nfpack NFVersion
 struct __nfpack NFReleaseInfo
 {
     NFVersion Version;
-    unsigned char InfoString[128-sizeof(NFVersion)];
+    unsigned char InfoString[128];
+    unsigned char TargetName[32];
+    unsigned char PlatformName[32];
 
-    static void Init(NFReleaseInfo& releaseInfo, unsigned short major=0, unsigned short minor=0, unsigned short build=0, unsigned short revision=0, const char *info=(const char *)NULL, size_t infoLen=0);
+    static void Init(
+        NFReleaseInfo& releaseInfo, 
+        unsigned short major=0, 
+        unsigned short minor=0, 
+        unsigned short build=0, 
+        unsigned short revision=0, 
+        const char *info=(const char *)NULL, 
+        size_t infoLen=0,
+        const char *target=(const char *)NULL, 
+        size_t targetLen=0,
+        const char *platform=(const char *)NULL, 
+        size_t platformLen=0
+        );
 };
 
 struct __nfpack OEM_MODEL_SKU
@@ -66,7 +80,7 @@ bool GetHalSystemInfo(HalSystemInfo& systemInfo);
 unsigned int nanoBooter_GetReleaseInfo(NFReleaseInfo& releaseInfo);
 
 // target specific function, provide this to allow access to a vendor-provided
-// informative string and build-time version information.
+// informative string, platform, target and build-time version information.
 bool Target_GetReleaseInfo(NFReleaseInfo&);
 
 //--//

diff --git a/src/HAL/nanoHAL_SystemInformation.cpp b/src/HAL/nanoHAL_SystemInformation.cpp
@@ -19,9 +19,15 @@ bool GetHalSystemInfo(HalSystemInfo& systemInfo)
     systemInfo.m_releaseInfo.Version.usMinor       = VERSION_MINOR;
     systemInfo.m_releaseInfo.Version.usBuild       = VERSION_BUILD;
     systemInfo.m_releaseInfo.Version.usRevision    = VERSION_REVISION;
-    const size_t len = sizeof(systemInfo.m_releaseInfo.InfoString);
-
+
+    size_t len = sizeof(systemInfo.m_releaseInfo.InfoString);
     hal_strncpy_s ((char*)&systemInfo.m_releaseInfo.InfoString[0], len, OEMSYSTEMINFOSTRING, len-1 );
+
+    len = sizeof(systemInfo.m_releaseInfo.PlatformName);
+    hal_strncpy_s ((char*)&systemInfo.m_releaseInfo.PlatformName[0], len, TARGETNAMESTRING, len-1 );
+
+    len = sizeof(systemInfo.m_releaseInfo.TargetName);
+    hal_strncpy_s ((char*)&systemInfo.m_releaseInfo.TargetName[0], len, PLATFORMNAMESTRING, len-1 );
 
     // we are not supporting this at this time
     // OEM_MODEL_SKU:
@@ -37,9 +43,18 @@ bool GetHalSystemInfo(HalSystemInfo& systemInfo)
 
 bool Target_GetReleaseInfo(NFReleaseInfo& releaseInfo)
 {
-    NFReleaseInfo::Init(releaseInfo,
-                        VERSION_MAJOR, VERSION_MINOR, VERSION_BUILD, VERSION_REVISION,
-                        OEMSYSTEMINFOSTRING, hal_strlen_s(OEMSYSTEMINFOSTRING)
-                        );
+    NFReleaseInfo::Init(
+        releaseInfo,
+        VERSION_MAJOR,
+        VERSION_MINOR,
+        VERSION_BUILD,
+        VERSION_REVISION,
+        OEMSYSTEMINFOSTRING,
+        hal_strlen_s(OEMSYSTEMINFOSTRING),
+        TARGETNAMESTRING,
+        hal_strlen_s(TARGETNAMESTRING),
+        PLATFORMNAMESTRING,
+        hal_strlen_s(PLATFORMNAMESTRING)
+        );
     return TRUE; // alternatively, return false if you didn't initialize the releaseInfo structure.
 }
diff --git a/targets/CMSIS-OS/ChibiOS/MBN_QUAIL/target_common.h.in b/targets/CMSIS-OS/ChibiOS/MBN_QUAIL/target_common.h.in
@@ -29,6 +29,11 @@
 
 /////////////////////////////////////////////////////////////////////////////////////////
 
+//////////////////////////////////////////////
+#define TARGETNAMESTRING "@CHIBIOS_BOARD@"
+#define PLATFORMNAMESTRING "STM32F4"
+//////////////////////////////////////////////
+
 /////////////////////////////////////
 //#define EVENTS_HEART_BEAT       palToggleLine(GPIOE_LED1)
 /////////////////////////////////////

diff --git a/targets/CMSIS-OS/ChibiOS/NETDUINO3_WIFI/target_common.h.in b/targets/CMSIS-OS/ChibiOS/NETDUINO3_WIFI/target_common.h.in
@@ -29,6 +29,10 @@
 
 /////////////////////////////////////////////////////////////////////////////////////////
 
+//////////////////////////////////////////////
+#define TARGETNAMESTRING "@CHIBIOS_BOARD@"
+#define PLATFORMNAMESTRING "STM32F4"
+//////////////////////////////////////////////
 
 
 #endif /* _TARGET_COMMON_H_ */
diff --git a/targets/CMSIS-OS/ChibiOS/ST_NUCLEO64_F091RC/target_common.h.in b/targets/CMSIS-OS/ChibiOS/ST_NUCLEO64_F091RC/target_common.h.in
@@ -36,6 +36,11 @@
 #define WP_PACKET_SIZE                  256U
 //////////////////////////////////////////////
 
+//////////////////////////////////////////////
+#define TARGETNAMESTRING "@CHIBIOS_BOARD@"
+#define PLATFORMNAMESTRING "STM32F0"
+//////////////////////////////////////////////
+
 /////////////////////////////////////
 //#define EVENTS_HEART_BEAT       palToggleLine(GPIOA_LED_GREEN)
 /////////////////////////////////////

diff --git a/targets/CMSIS-OS/ChibiOS/ST_STM32F429I_DISCOVERY/target_common.h.in b/targets/CMSIS-OS/ChibiOS/ST_STM32F429I_DISCOVERY/target_common.h.in
@@ -29,6 +29,11 @@
 
 /////////////////////////////////////////////////////////////////////////////////////////
 
+//////////////////////////////////////////////
+#define TARGETNAMESTRING "@CHIBIOS_BOARD@"
+#define PLATFORMNAMESTRING "STM32F4"
+//////////////////////////////////////////////
+
 /////////////////////////////////////
 //#define EVENTS_HEART_BEAT       palToggleLine(GPIOG_LED3_GREEN)
 /////////////////////////////////////

diff --git a/targets/CMSIS-OS/ChibiOS/ST_STM32F769I_DISCOVERY/target_common.h.in b/targets/CMSIS-OS/ChibiOS/ST_STM32F769I_DISCOVERY/target_common.h.in
@@ -29,6 +29,11 @@
 
 /////////////////////////////////////////////////////////////////////////////////////////
 
+//////////////////////////////////////////////
+#define TARGETNAMESTRING "@CHIBIOS_BOARD@"
+#define PLATFORMNAMESTRING "STM32F7"
+//////////////////////////////////////////////
+
 /////////////////////////////////////
 #define PLATFORM_HAS_RNG       TRUE
 /////////////////////////////////////

diff --git a/targets/FreeRTOS_ESP32/ESP32_WROOM_32/target_common.h.in b/targets/FreeRTOS_ESP32/ESP32_WROOM_32/target_common.h.in
@@ -29,6 +29,11 @@
 
 /////////////////////////////////////////////////////////////////////////////////////////
 
+//////////////////////////////////////////////
+#define TARGETNAMESTRING "ESP32_WROOM_32"
+#define PLATFORMNAMESTRING "ESP32"
+//////////////////////////////////////////////
+
 /////////////////////////////////////
 // #define EVENTS_HEART_BEAT
 /////////////////////////////////////

diff --git a/targets/TI-SimpleLink/TI_CC3220SF_LAUNCHXL/common/Device_BlockStorage.c b/targets/TI-SimpleLink/TI_CC3220SF_LAUNCHXL/common/Device_BlockStorage.c
@@ -11,8 +11,8 @@ const BlockRange BlockRange1[] =
 {
     // the 1st block is reserved for the flash header 
     // so we don't take it into account for the map
-    { BlockRange_BLOCKTYPE_CODE          ,   0  , 92 },           // 0x01000800 nanoCLR
-    { BlockRange_BLOCKTYPE_DEPLOYMENT    ,   93, 510 },           // 0x 102F000 deployment
+    { BlockRange_BLOCKTYPE_CODE          ,   0  , 93 },           // 0x01000800 nanoCLR
+    { BlockRange_BLOCKTYPE_DEPLOYMENT    ,   94, 510 },           // 0x0102F800 deployment
 };
 
 const BlockRegionInfo BlockRegions[] = 

diff --git a/targets/TI-SimpleLink/TI_CC3220SF_LAUNCHXL/nanoCLR/CC3220SF_CLR.ld b/targets/TI-SimpleLink/TI_CC3220SF_LAUNCHXL/nanoCLR/CC3220SF_CLR.ld
@@ -35,7 +35,7 @@ STACKSIZE = 0x800;
 MEMORY
 {
     FLASH_HDR (RX)  : ORIGIN = 0x01000000, LENGTH = 0x7FF
-    FLASH     (RX)  : ORIGIN = 0x01000800, LENGTH = 0x02E800
+    FLASH     (RX)  : ORIGIN = 0x01000800, LENGTH = 0x02F000
     SRAM      (RWX) : ORIGIN = 0x20000000, LENGTH = 0x00040000
 }
 

diff --git a/targets/TI-SimpleLink/TI_CC3220SF_LAUNCHXL/target_common.h.in b/targets/TI-SimpleLink/TI_CC3220SF_LAUNCHXL/target_common.h.in
@@ -33,7 +33,11 @@
 #define PLATFORM_HAS_RNG       TRUE
 /////////////////////////////////////
 
+//////////////////////////////////////////////
 #define OEMSYSTEMINFOSTRING "nanoCLR running @ @TI_BOARD@ built with TI SL CC32xx SDK v3.10.00.04"
+#define TARGETNAMESTRING "@TI_BOARD@"
+#define PLATFORMNAMESTRING "TI_SL_CC32xx"
+//////////////////////////////////////////////
 
 //////////////////////////////////////////////
 // set Wire Protocol packet size