You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by cc...@apache.org on 2016/09/30 20:33:16 UTC
[3/3] incubator-mynewt-core git commit: nrf52dk - Enable reboot log.
nrf52dk - Enable reboot log.
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/158051c1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/158051c1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/158051c1
Branch: refs/heads/develop
Commit: 158051c199371a80efc0a4fabfb28d2b6af4f9b6
Parents: 0d2962b
Author: Christopher Collins <cc...@apache.org>
Authored: Fri Sep 30 13:32:25 2016 -0700
Committer: Christopher Collins <cc...@apache.org>
Committed: Fri Sep 30 13:33:06 2016 -0700
----------------------------------------------------------------------
hw/bsp/nrf52dk/boot-nrf52dk.ld | 2 +-
hw/bsp/nrf52dk/src/os_bsp.c | 7 ++++++-
2 files changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/158051c1/hw/bsp/nrf52dk/boot-nrf52dk.ld
----------------------------------------------------------------------
diff --git a/hw/bsp/nrf52dk/boot-nrf52dk.ld b/hw/bsp/nrf52dk/boot-nrf52dk.ld
index 8c47d2e..5bb2099 100755
--- a/hw/bsp/nrf52dk/boot-nrf52dk.ld
+++ b/hw/bsp/nrf52dk/boot-nrf52dk.ld
@@ -19,7 +19,7 @@ OUTPUT_FORMAT ("elf32-littlearm", "elf32-bigarm", "elf32-littlearm")
MEMORY
{
- FLASH (rx) : ORIGIN = 0x00000000, LENGTH = 0x8000
+ FLASH (rx) : ORIGIN = 0x00000000, LENGTH = 0x4000
RAM (rwx) : ORIGIN = 0x20000000, LENGTH = 0x10000
}
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/158051c1/hw/bsp/nrf52dk/src/os_bsp.c
----------------------------------------------------------------------
diff --git a/hw/bsp/nrf52dk/src/os_bsp.c b/hw/bsp/nrf52dk/src/os_bsp.c
index 4f90473..30df5bd 100644
--- a/hw/bsp/nrf52dk/src/os_bsp.c
+++ b/hw/bsp/nrf52dk/src/os_bsp.c
@@ -52,7 +52,7 @@ static struct flash_area bsp_flash_areas[] = {
[FLASH_AREA_BOOTLOADER] = {
.fa_flash_id = 0, /* internal flash */
.fa_off = 0x00000000, /* beginning */
- .fa_size = (32 * 1024)
+ .fa_size = (16 * 1024)
},
/* 2*16K and 1*64K sectors here */
[FLASH_AREA_IMAGE_0] = {
@@ -74,6 +74,11 @@ static struct flash_area bsp_flash_areas[] = {
.fa_flash_id = 0,
.fa_off = 0x0007d000,
.fa_size = (12 * 1024)
+ },
+ [FLASH_AREA_REBOOT_LOG] = {
+ .fa_flash_id = 0,
+ .fa_off = 0x00004000,
+ .fa_size = (16 * 1024)
}
};