Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update block storage definition for ESP32 #1267

Merged
merged 1 commit into from
Mar 18, 2019
Merged

Update block storage definition for ESP32 #1267

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions targets/FreeRTOS_ESP32/ESP32_WROOM_32/common/Device_BlockStorage-2mb.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,46 +13,46 @@
const BlockRange BlockRange1[] =
{
// factory
{ BlockRange_BLOCKTYPE_CODE , 1, 15 }, // 0x010000 nanoCLR
{ BlockRange_BLOCKTYPE_CODE , 0, 1 }, // 0x010000 nanoCLR
};

const BlockRange BlockRange2[] =
{
// deploy
{ BlockRange_BLOCKTYPE_DEPLOYMENT, 0, 5 }, // 0x110000 deployment
{ BlockRange_BLOCKTYPE_DEPLOYMENT, 0, 0 }, // 0x110000 deployment
};

const BlockRange BlockRange3[] =
{
// config
{ BlockRange_BLOCKTYPE_CONFIG , 0, 1 } // 0x2D0000 config
{ BlockRange_BLOCKTYPE_CONFIG , 0, 0 } // 0x2D0000 config
};

const BlockRegionInfo BlockRegions[] =
{
{
(0), // no attributes for this region
0x010000, // start address for block region
16, // total number of blocks in this region
0x10000, // 64K // total number of bytes per block
1, // total number of blocks in this region
0x100000, // total number of bytes per block
ARRAYSIZE_CONST_EXPR(BlockRange1),
BlockRange1,
},

{
(BlockRegionAttribute_MemoryMapped), // this region is memory mapped
0x110000, // start address for block region
6, // total number of blocks in this region
0x10000, // 64K // total number of bytes per block
1, // total number of blocks in this region
0x70000, // total number of bytes per block
ARRAYSIZE_CONST_EXPR(BlockRange2),
BlockRange2,
},

{
(0), // no attributes for this region
0x0, // start address for block region
2, // total number of blocks in this region
0x10000, // 64K // total number of bytes per block
1, // total number of blocks in this region
0x10000, // total number of bytes per block
ARRAYSIZE_CONST_EXPR(BlockRange3),
BlockRange3,
}
Expand Down
18 changes: 9 additions & 9 deletions targets/FreeRTOS_ESP32/ESP32_WROOM_32/common/Device_BlockStorage-4mb.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,46 +13,46 @@
const BlockRange BlockRange1[] =
{
// factory
{ BlockRange_BLOCKTYPE_CODE , 1, 15 }, // 0x010000 nanoCLR
{ BlockRange_BLOCKTYPE_CODE , 0, 0 }, // 0x010000 nanoCLR
};

const BlockRange BlockRange2[] =
{
// deploy
{ BlockRange_BLOCKTYPE_DEPLOYMENT, 0, 27 }, // 0x110000 deployment
{ BlockRange_BLOCKTYPE_DEPLOYMENT, 0, 0 }, // 0x110000 deployment
};

const BlockRange BlockRange3[] =
{
// config
{ BlockRange_BLOCKTYPE_CONFIG , 0, 3 } // 0x2D0000 config
{ BlockRange_BLOCKTYPE_CONFIG , 0, 0 } // 0x2D0000 config
};

const BlockRegionInfo BlockRegions[] =
{
{
(0), // no attributes for this region
0x010000, // start address for block region (initially this is set as the partition start address)
16, // total number of blocks in this region
0x10000, // 64K // total number of bytes per block
1, // total number of blocks in this region
0x100000, // total number of bytes per block
ARRAYSIZE_CONST_EXPR(BlockRange1),
BlockRange1
},

{
(BlockRegionAttribute_MemoryMapped), // this region is memory mapped
0x110000, // start address for block region (initially this is set as the partition start address)
28, // total number of blocks in this region
0x10000, // 64K // total number of bytes per block
1, // total number of blocks in this region
0x1C0000, // total number of bytes per block
ARRAYSIZE_CONST_EXPR(BlockRange2),
BlockRange2
},

{
(0), // no attributes for this region
0x2D0000, // start address for block region (initially this is set as the partition start address)
4, // total number of blocks in this region
0x10000, // 64K // total number of bytes per block
1, // total number of blocks in this region
0x40000, // total number of bytes per block
ARRAYSIZE_CONST_EXPR(BlockRange3),
BlockRange3
}
Expand Down