You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by we...@apache.org on 2016/04/16 01:03:19 UTC
incubator-mynewt-core git commit: Erroneously commited a different
nrf51dk.ld
Repository: incubator-mynewt-core
Updated Branches:
refs/heads/develop 33afb22a2 -> de7332a38
Erroneously commited a different nrf51dk.ld
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/de7332a3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/de7332a3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/de7332a3
Branch: refs/heads/develop
Commit: de7332a386dda45e1df40183dcca2184c143b3e0
Parents: 33afb22
Author: William San Filippo <wi...@runtime.io>
Authored: Fri Apr 15 16:03:08 2016 -0700
Committer: William San Filippo <wi...@runtime.io>
Committed: Fri Apr 15 16:03:08 2016 -0700
----------------------------------------------------------------------
hw/bsp/nrf51dk/nrf51dk.ld | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/de7332a3/hw/bsp/nrf51dk/nrf51dk.ld
----------------------------------------------------------------------
diff --git a/hw/bsp/nrf51dk/nrf51dk.ld b/hw/bsp/nrf51dk/nrf51dk.ld
index b5547fc..094f2c4 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 = 0x00000000, LENGTH = 0x40000
+ FLASH (rx) : ORIGIN = 0x00008000, LENGTH = 0x1b800
RAM (rwx) : ORIGIN = 0x20000000, LENGTH = 0x8000
}
@@ -27,7 +27,7 @@ MEMORY
* with other linker script that defines memory regions FLASH and RAM.
* It references following symbols, which must be defined in code:
* Reset_Handler : Entry of reset handler
- *
+ *
* It defines following symbols, which code can use without definition:
* __exidx_start
* __exidx_end
@@ -54,6 +54,11 @@ ENTRY(Reset_Handler)
SECTIONS
{
+ .imghdr (NOLOAD):
+ {
+ . = . + 0x20;
+ } > FLASH
+
.text :
{
__isr_vector_start = .;
@@ -85,7 +90,7 @@ SECTIONS
} > FLASH
- .ARM.extab :
+ .ARM.extab :
{
*(.ARM.extab* .gnu.linkonce.armextab.*)
. = ALIGN(4);
@@ -109,7 +114,7 @@ SECTIONS
. = . + (__isr_vector_end - __isr_vector_start);
. = ALIGN(4);
} > RAM
-
+
.data : AT (__etext)
{
__data_start__ = .;