Merge branch 'dev' of https://github.com/NETMF/netmf-interpreter into dev

Author: smaillet-ms

Solutions/MCBSTM32F400/DeviceCode/Blockstorage/M29W640FB/M29W640FB_BlConfig.cpp

@@ -15,7 +15,7 @@
 
 #define FLASH_BYTES_PER_SECTOR               2
 #define FLASH_SECTOR_WRITE_TYPICAL_TIME_USEC 1400    // not used
-#define FLASH_BLOCK_ERASE_ACTUAL_TIME_USEC   800000 // not used
+#define FLASH_BLOCK_ERASE_ACTUAL_TIME_USEC   800000  // not used
 #define FLASH_BLOCK_ERASE_MAX_TIME_USEC      6000000 // not used
 
 #define FLASH_ADDRESS1                       0x60000000
@@ -28,7 +28,7 @@
 
 // EBIU Information
 
-#define M29W640FB__SIZE_IN_BYTES     0x00800000    // 8MB
+#define M29W640FB__SIZE_IN_BYTES     0x00800000      // 8MB
 #define M29W640FB__WP_GPIO_PIN       GPIO_PIN_NONE
 #define M29W640FB__WP_ACTIVE         FALSE
 
@@ -44,18 +44,18 @@
 const BlockRange g_M29W640FB_BlockRange1[] =
 {
     // ER_CONFIG
-    { BlockRange::BLOCKTYPE_CONFIG,   0,  7 },    // 8x8KB=64KB
+    { BlockRange::BLOCKTYPE_CONFIG,   0,  7 },        // 8x8KB=64KB
 };
 
 const BlockRange g_M29W640FB_BlockRange2[] =
 {
     // ER_DAT
-    { BlockRange::BLOCKTYPE_CODE,   0,  1 },    // 2x64KB = 128KB
+    { BlockRange::BLOCKTYPE_CODE,   0,  2 },          // 3x64KB = 192KB
 #ifdef DEBUG
     // In debug builds with TRACE pins enabled, only 1MB is available
-    { BlockRange::BLOCKTYPE_DEPLOYMENT,   2,  15 },   // 15x64KB = 896KB
+    { BlockRange::BLOCKTYPE_DEPLOYMENT,   3,  15 },   // 13x64KB = 832KB
 #else
-    { BlockRange::BLOCKTYPE_DEPLOYMENT,   2,  126 },  // 126x64KB = 8000KB
+    { BlockRange::BLOCKTYPE_DEPLOYMENT,   3,  126 },  // 124x64KB = 7936KB
 #endif
 };
 
@@ -65,14 +65,14 @@ const BlockRegionInfo  g_M29W640FB_BlkRegion[M29W640FB__NUM_REGIONS] =
     {
         FLASH_ADDRESS1,                 // ByteAddress  Start;         // Starting Sector address
         FLASH_BLOCK1_COUNT,             // UINT32       NumBlocks;     // total number of blocks in this region
-        FLASH_BLOCK1_BYTES_PER_BLOCK,     // UINT32       BytesPerBlock; // Total number of bytes per block
+        FLASH_BLOCK1_BYTES_PER_BLOCK,   // UINT32       BytesPerBlock; // Total number of bytes per block
         ARRAYSIZE_CONST_EXPR(g_M29W640FB_BlockRange1),
         g_M29W640FB_BlockRange1,
     },
     {
         FLASH_ADDRESS2,                 // ByteAddress  Start;         // Starting Sector address
         FLASH_BLOCK2_COUNT,             // UINT32       NumBlocks;     // total number of blocks in this region
-        FLASH_BLOCK2_BYTES_PER_BLOCK,     // UINT32       BytesPerBlock; // Total number of bytes per block
+        FLASH_BLOCK2_BYTES_PER_BLOCK,   // UINT32       BytesPerBlock; // Total number of bytes per block
         ARRAYSIZE_CONST_EXPR(g_M29W640FB_BlockRange2),
         g_M29W640FB_BlockRange2,
     }

Solutions/MCBSTM32F400/TinyCLR/scatterfile_tinyclr_mdk.xml

@@ -50,7 +50,7 @@
 
     <!-- DAT region goes into external NOR Flash -->
     <Set Name="Data_BaseAddress"        Value="%Config_BaseAddress% + %Config_Size%"/>
-    <Set Name="Data_Size"               Value="0x00020000"/><!-- 128KB -->
+    <Set Name="Data_Size"               Value="0x00030000"/><!-- 192KB -->
     <!-- Deployment fills the rest of external NOR flash... -->
 
     <!-- Internal FLASH -->