You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by ma...@apache.org on 2016/06/10 21:31:47 UTC
[1/2] incubator-mynewt-core git commit: Fixing flash native map: Unit
tests detected this
Repository: incubator-mynewt-core
Updated Branches:
refs/heads/develop 69914287c -> 8cee49624
Fixing flash native map: Unit tests detected this
Project: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/commit/d92b6bb9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/d92b6bb9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/d92b6bb9
Branch: refs/heads/develop
Commit: d92b6bb91d1efca598057f6448881cbd3496c892
Parents: 84f0e6c
Author: Vipul Rahane <vi...@runtime.io>
Authored: Fri Jun 10 12:20:00 2016 -0700
Committer: Vipul Rahane <vi...@runtime.io>
Committed: Fri Jun 10 13:54:52 2016 -0700
----------------------------------------------------------------------
hw/bsp/native/src/os_bsp.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d92b6bb9/hw/bsp/native/src/os_bsp.c
----------------------------------------------------------------------
diff --git a/hw/bsp/native/src/os_bsp.c b/hw/bsp/native/src/os_bsp.c
index 4a60bf9..a04c48f 100644
--- a/hw/bsp/native/src/os_bsp.c
+++ b/hw/bsp/native/src/os_bsp.c
@@ -23,14 +23,9 @@ static struct flash_area bsp_flash_areas[] = {
[FLASH_AREA_BOOTLOADER] = {
.fa_flash_id = 0, /* internal flash */
.fa_off = 0x00000000, /* beginning */
- .fa_size = (32 * 1024)
- },
- [FLASH_AREA_REBOOT_LOG] = {
- .fa_flash_id = 0,
- .fa_off = 0x00010000,
.fa_size = (16 * 1024)
},
- /* 1 * 16K and 1*64K sectors here */
+ /* 2 * 16K and 1*64K sectors here */
[FLASH_AREA_IMAGE_0] = {
.fa_flash_id = 0,
.fa_off = 0x00020000,
@@ -50,7 +45,12 @@ static struct flash_area bsp_flash_areas[] = {
.fa_flash_id = 0,
.fa_off = 0x00008000,
.fa_size = (32 * 1024)
- }
+ },
+ [FLASH_AREA_REBOOT_LOG] = {
+ .fa_flash_id = 0,
+ .fa_off = 0x00004000,
+ .fa_size = (16 * 1024)
+ },
};
/*
[2/2] incubator-mynewt-core git commit: This closes #63.
Posted by ma...@apache.org.
This closes #63.
Merge branch 'develop' of https://github.com/vrahane/incubator-mynewt-core into develop
Project: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/commit/8cee4962
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/8cee4962
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/8cee4962
Branch: refs/heads/develop
Commit: 8cee49624a67f3345251dce6508ad83384475523
Parents: 6991428 d92b6bb
Author: Marko Kiiskila <ma...@runtime.io>
Authored: Fri Jun 10 14:29:57 2016 -0700
Committer: Marko Kiiskila <ma...@runtime.io>
Committed: Fri Jun 10 14:29:57 2016 -0700
----------------------------------------------------------------------
hw/bsp/native/src/os_bsp.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------