Repository: incubator-mynewt-core
Updated Branches:
  refs/heads/master 95935c62c -> b8a354970


nrf51 bsp fixes from discussion 
https://github.com/apache/incubator-mynewt-core/pull/198/files


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

Branch: refs/heads/master
Commit: f1779916f044bc2e785a1bca7eb2033d267b6caf
Parents: e23872d
Author: Jacob Rosenthal <jakerosent...@gmail.com>
Authored: Sun Apr 9 20:51:20 2017 -0700
Committer: Jacob Rosenthal <jakerosent...@gmail.com>
Committed: Sun Apr 9 20:51:20 2017 -0700

----------------------------------------------------------------------
 hw/bsp/bmd200/src/sbrk.c                        | 2 --
 hw/bsp/bmd300eval/src/sbrk.c                    | 2 --
 hw/bsp/nrf51-blenano/split-nrf51dk.ld           | 4 ++--
 hw/bsp/nrf51dk-16kbram/split-nrf51dk-16kbram.ld | 4 ++--
 hw/bsp/nrf51dk-16kbram/src/sbrk.c               | 2 --
 hw/bsp/nrf51dk/src/sbrk.c                       | 2 --
 hw/bsp/usbmkw41z/src/sbrk.c                     | 2 --
 7 files changed, 4 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/f1779916/hw/bsp/bmd200/src/sbrk.c
----------------------------------------------------------------------
diff --git a/hw/bsp/bmd200/src/sbrk.c b/hw/bsp/bmd200/src/sbrk.c
index 5df43c9..3fe253e 100644
--- a/hw/bsp/bmd200/src/sbrk.c
+++ b/hw/bsp/bmd200/src/sbrk.c
@@ -17,8 +17,6 @@
  * under the License.
  */
 
-#include <hal/hal_bsp.h>
-
 /* put these in the data section so they are not cleared by _start */
 static char *sbrkBase __attribute__ ((section (".data")));
 static char *sbrkLimit __attribute__ ((section (".data")));

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/f1779916/hw/bsp/bmd300eval/src/sbrk.c
----------------------------------------------------------------------
diff --git a/hw/bsp/bmd300eval/src/sbrk.c b/hw/bsp/bmd300eval/src/sbrk.c
index 5df43c9..3fe253e 100644
--- a/hw/bsp/bmd300eval/src/sbrk.c
+++ b/hw/bsp/bmd300eval/src/sbrk.c
@@ -17,8 +17,6 @@
  * under the License.
  */
 
-#include <hal/hal_bsp.h>
-
 /* put these in the data section so they are not cleared by _start */
 static char *sbrkBase __attribute__ ((section (".data")));
 static char *sbrkLimit __attribute__ ((section (".data")));

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/f1779916/hw/bsp/nrf51-blenano/split-nrf51dk.ld
----------------------------------------------------------------------
diff --git a/hw/bsp/nrf51-blenano/split-nrf51dk.ld 
b/hw/bsp/nrf51-blenano/split-nrf51dk.ld
index bd8c2be..55d154e 100755
--- a/hw/bsp/nrf51-blenano/split-nrf51dk.ld
+++ b/hw/bsp/nrf51-blenano/split-nrf51dk.ld
@@ -116,7 +116,7 @@ SECTIONS
          _loader_ram_end = .;
     } > RAM
 
-    .data : AT (__etext)
+    .data :
     {
         __data_start__ = .;
         *(.data*)
@@ -146,7 +146,7 @@ SECTIONS
         . = ALIGN(4);
         /* All data end */
         __data_end__ = .;
-    } > RAM
+    } > RAM AT > FLASH
 
     .bss :
     {

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/f1779916/hw/bsp/nrf51dk-16kbram/split-nrf51dk-16kbram.ld
----------------------------------------------------------------------
diff --git a/hw/bsp/nrf51dk-16kbram/split-nrf51dk-16kbram.ld 
b/hw/bsp/nrf51dk-16kbram/split-nrf51dk-16kbram.ld
index 3847e7c..9c051f8 100755
--- a/hw/bsp/nrf51dk-16kbram/split-nrf51dk-16kbram.ld
+++ b/hw/bsp/nrf51dk-16kbram/split-nrf51dk-16kbram.ld
@@ -116,7 +116,7 @@ SECTIONS
          _loader_ram_end = .;
     } > RAM
 
-    .data : AT (__etext)
+    .data :
     {
         __data_start__ = .;
         *(.data*)
@@ -146,7 +146,7 @@ SECTIONS
         . = ALIGN(4);
         /* All data end */
         __data_end__ = .;
-    } > RAM
+    } > RAM AT > FLASH
 
     .bss :
     {

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/f1779916/hw/bsp/nrf51dk-16kbram/src/sbrk.c
----------------------------------------------------------------------
diff --git a/hw/bsp/nrf51dk-16kbram/src/sbrk.c 
b/hw/bsp/nrf51dk-16kbram/src/sbrk.c
index 5df43c9..3fe253e 100644
--- a/hw/bsp/nrf51dk-16kbram/src/sbrk.c
+++ b/hw/bsp/nrf51dk-16kbram/src/sbrk.c
@@ -17,8 +17,6 @@
  * under the License.
  */
 
-#include <hal/hal_bsp.h>
-
 /* put these in the data section so they are not cleared by _start */
 static char *sbrkBase __attribute__ ((section (".data")));
 static char *sbrkLimit __attribute__ ((section (".data")));

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/f1779916/hw/bsp/nrf51dk/src/sbrk.c
----------------------------------------------------------------------
diff --git a/hw/bsp/nrf51dk/src/sbrk.c b/hw/bsp/nrf51dk/src/sbrk.c
index 5df43c9..3fe253e 100644
--- a/hw/bsp/nrf51dk/src/sbrk.c
+++ b/hw/bsp/nrf51dk/src/sbrk.c
@@ -17,8 +17,6 @@
  * under the License.
  */
 
-#include <hal/hal_bsp.h>
-
 /* put these in the data section so they are not cleared by _start */
 static char *sbrkBase __attribute__ ((section (".data")));
 static char *sbrkLimit __attribute__ ((section (".data")));

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/f1779916/hw/bsp/usbmkw41z/src/sbrk.c
----------------------------------------------------------------------
diff --git a/hw/bsp/usbmkw41z/src/sbrk.c b/hw/bsp/usbmkw41z/src/sbrk.c
index 5df43c9..3fe253e 100644
--- a/hw/bsp/usbmkw41z/src/sbrk.c
+++ b/hw/bsp/usbmkw41z/src/sbrk.c
@@ -17,8 +17,6 @@
  * under the License.
  */
 
-#include <hal/hal_bsp.h>
-
 /* put these in the data section so they are not cleared by _start */
 static char *sbrkBase __attribute__ ((section (".data")));
 static char *sbrkLimit __attribute__ ((section (".data")));

Reply via email to