mynewt-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ccoll...@apache.org
Subject [2/4] incubator-mynewt-core git commit: No Jira ticket: had to increase the size of the bootloader on the nrf51 to 32K
Date Tue, 15 Mar 2016 02:47:52 GMT
No Jira ticket: had to increase the size of the bootloader on the nrf51 to 32K


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/c8f8b9a3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/c8f8b9a3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/c8f8b9a3

Branch: refs/heads/master
Commit: c8f8b9a39a3bf20745eb69f624885186a2438692
Parents: 963e765
Author: wes3 <will@micosa.io>
Authored: Mon Mar 14 19:17:31 2016 -0700
Committer: wes3 <will@micosa.io>
Committed: Mon Mar 14 19:17:39 2016 -0700

----------------------------------------------------------------------
 hw/bsp/nrf51dk/boot-nrf51dk.ld     |  2 +-
 hw/bsp/nrf51dk/nrf51dk.ld          |  2 +-
 hw/bsp/nrf51dk/nrf51dk_download.sh |  2 +-
 hw/bsp/nrf51dk/src/os_bsp.c        | 10 +++++-----
 4 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/c8f8b9a3/hw/bsp/nrf51dk/boot-nrf51dk.ld
----------------------------------------------------------------------
diff --git a/hw/bsp/nrf51dk/boot-nrf51dk.ld b/hw/bsp/nrf51dk/boot-nrf51dk.ld
index 80bca75..1d514a5 100755
--- a/hw/bsp/nrf51dk/boot-nrf51dk.ld
+++ b/hw/bsp/nrf51dk/boot-nrf51dk.ld
@@ -19,7 +19,7 @@ OUTPUT_FORMAT ("elf32-littlearm", "elf32-bigarm", "elf32-littlearm")
 
 MEMORY
 {
-  FLASH (rx) : ORIGIN = 0x00000000, LENGTH = 0x7000
+  FLASH (rx) : ORIGIN = 0x00000000, LENGTH = 0x8000
   RAM (rwx) :  ORIGIN = 0x20000000, LENGTH = 0x8000
 }
 

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/c8f8b9a3/hw/bsp/nrf51dk/nrf51dk.ld
----------------------------------------------------------------------
diff --git a/hw/bsp/nrf51dk/nrf51dk.ld b/hw/bsp/nrf51dk/nrf51dk.ld
index 4729b93..ca85250 100755
--- a/hw/bsp/nrf51dk/nrf51dk.ld
+++ b/hw/bsp/nrf51dk/nrf51dk.ld
@@ -19,7 +19,7 @@ OUTPUT_FORMAT ("elf32-littlearm", "elf32-bigarm", "elf32-littlearm")
 
 MEMORY
 {
-  FLASH (rx) : ORIGIN = 0x00007000, LENGTH = 0x1c000
+  FLASH (rx) : ORIGIN = 0x00008000, LENGTH = 0x1b800
   RAM (rwx) :  ORIGIN = 0x20000000, LENGTH = 0x8000
 }
 

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/c8f8b9a3/hw/bsp/nrf51dk/nrf51dk_download.sh
----------------------------------------------------------------------
diff --git a/hw/bsp/nrf51dk/nrf51dk_download.sh b/hw/bsp/nrf51dk/nrf51dk_download.sh
index 152fa14..2ee17e9 100755
--- a/hw/bsp/nrf51dk/nrf51dk_download.sh
+++ b/hw/bsp/nrf51dk/nrf51dk_download.sh
@@ -48,7 +48,7 @@ if [ $IS_BOOTLOADER -eq 1 ]; then
     FLASH_OFFSET=0x0
     FILE_NAME=$BASENAME.elf.bin
 else
-    FLASH_OFFSET=0x7000
+    FLASH_OFFSET=0x8000
     FILE_NAME=$BASENAME.img
 fi
 

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/c8f8b9a3/hw/bsp/nrf51dk/src/os_bsp.c
----------------------------------------------------------------------
diff --git a/hw/bsp/nrf51dk/src/os_bsp.c b/hw/bsp/nrf51dk/src/os_bsp.c
index e09bdee..906bc81 100644
--- a/hw/bsp/nrf51dk/src/os_bsp.c
+++ b/hw/bsp/nrf51dk/src/os_bsp.c
@@ -28,17 +28,17 @@ static struct flash_area bsp_flash_areas[] = {
     [FLASH_AREA_BOOTLOADER] = {
         .fa_flash_id = 0,       /* internal flash */
         .fa_off = 0x00000000,   /* beginning */
-        .fa_size = (28 * 1024)
+        .fa_size = (32 * 1024)
     },
     [FLASH_AREA_IMAGE_0] = {
         .fa_flash_id = 0,
-        .fa_off = 0x00007000,
-        .fa_size = (112 * 1024)
+        .fa_off = 0x00008000,
+        .fa_size = (110 * 1024)
     },
     [FLASH_AREA_IMAGE_1] = {
         .fa_flash_id = 0,
-        .fa_off = 0x00023000,
-        .fa_size = (112 * 1024)
+        .fa_off = 0x00023800,
+        .fa_size = (110 * 1024)
     },
     [FLASH_AREA_IMAGE_SCRATCH] = {
         .fa_flash_id = 0,


Mime
View raw message