You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by pa...@apache.org on 2016/09/07 22:29:11 UTC
incubator-mynewt-core git commit: I had put these in the wrong place.
I have to put them in a place where calling them doesn;
t do anything. Instead I had put them after the data init so that they were
overwriting the important stuff.
Repository: incubator-mynewt-core
Updated Branches:
refs/heads/develop 90a567cab -> 260a90ebb
I had put these in the wrong place. I have to put them in a place where calling them doesn;t
do anything. Instead I had put them after the data init so that they were overwriting the
important stuff.
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/260a90eb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/260a90eb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/260a90eb
Branch: refs/heads/develop
Commit: 260a90ebb75609de35225ca6fab75bb308edb182
Parents: 90a567c
Author: Paul Dietrich <pa...@yahoo.com>
Authored: Wed Sep 7 15:26:33 2016 -0700
Committer: Paul Dietrich <pa...@yahoo.com>
Committed: Wed Sep 7 15:26:33 2016 -0700
----------------------------------------------------------------------
.../src/arch/cortex_m4/gcc_startup_nrf52.s | 9 ++++-----
hw/bsp/bmd300eval/src/arch/cortex_m4/gcc_startup_nrf52.s | 10 +++++-----
.../nrf51-blenano/src/arch/cortex_m0/gcc_startup_nrf51.s | 10 +++++-----
.../src/arch/cortex_m0/gcc_startup_nrf51.s | 10 +++++-----
hw/bsp/nrf51dk/src/arch/cortex_m0/gcc_startup_nrf51.s | 10 +++++-----
hw/bsp/nrf52dk/src/arch/cortex_m4/gcc_startup_nrf52.s | 9 ++++-----
6 files changed, 28 insertions(+), 30 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/260a90eb/hw/bsp/arduino_primo_nrf52/src/arch/cortex_m4/gcc_startup_nrf52.s
----------------------------------------------------------------------
diff --git a/hw/bsp/arduino_primo_nrf52/src/arch/cortex_m4/gcc_startup_nrf52.s b/hw/bsp/arduino_primo_nrf52/src/arch/cortex_m4/gcc_startup_nrf52.s
index 033f227..de2a2fa 100755
--- a/hw/bsp/arduino_primo_nrf52/src/arch/cortex_m4/gcc_startup_nrf52.s
+++ b/hw/bsp/arduino_primo_nrf52/src/arch/cortex_m4/gcc_startup_nrf52.s
@@ -138,6 +138,10 @@ __isr_vector:
Reset_Handler:
.fnstart
+ /* This is called but current_slot is in the data section so it is
+ * overwritten. its only called here to ensure that the global and this
+ * function are linked into the loader */
+ BL bsp_slot_init_split_application
/* Loop to copy data from read only memory to RAM. The ranges
* of copy from/to are specified by following symbols evaluated in
@@ -168,11 +172,6 @@ Reset_Handler:
LDR R0, =SystemInit
BLX R0
- /* This is called but current_slot is in the data section so it is
- * overwritten. its only called here to ensure that the global and this
- * function are linked into the loader */
- BL bsp_slot_init_split_application
-
LDR R0, =_start
BX R0
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/260a90eb/hw/bsp/bmd300eval/src/arch/cortex_m4/gcc_startup_nrf52.s
----------------------------------------------------------------------
diff --git a/hw/bsp/bmd300eval/src/arch/cortex_m4/gcc_startup_nrf52.s b/hw/bsp/bmd300eval/src/arch/cortex_m4/gcc_startup_nrf52.s
index 033f227..8c667f9 100755
--- a/hw/bsp/bmd300eval/src/arch/cortex_m4/gcc_startup_nrf52.s
+++ b/hw/bsp/bmd300eval/src/arch/cortex_m4/gcc_startup_nrf52.s
@@ -138,6 +138,11 @@ __isr_vector:
Reset_Handler:
.fnstart
+ /* This is called but current_slot is in the data section so it is
+ * overwritten. its only called here to ensure that the global and this
+ * function are linked into the loader */
+ BL bsp_slot_init_split_application
+
/* Loop to copy data from read only memory to RAM. The ranges
* of copy from/to are specified by following symbols evaluated in
@@ -168,11 +173,6 @@ Reset_Handler:
LDR R0, =SystemInit
BLX R0
- /* This is called but current_slot is in the data section so it is
- * overwritten. its only called here to ensure that the global and this
- * function are linked into the loader */
- BL bsp_slot_init_split_application
-
LDR R0, =_start
BX R0
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/260a90eb/hw/bsp/nrf51-blenano/src/arch/cortex_m0/gcc_startup_nrf51.s
----------------------------------------------------------------------
diff --git a/hw/bsp/nrf51-blenano/src/arch/cortex_m0/gcc_startup_nrf51.s b/hw/bsp/nrf51-blenano/src/arch/cortex_m0/gcc_startup_nrf51.s
index 19ff3d8..0773621 100755
--- a/hw/bsp/nrf51-blenano/src/arch/cortex_m0/gcc_startup_nrf51.s
+++ b/hw/bsp/nrf51-blenano/src/arch/cortex_m0/gcc_startup_nrf51.s
@@ -149,6 +149,11 @@ Reset_Handler:
ORRS R2, R1
STR R2, [R0]
+ /* This is called but current_slot is in the data section so it is
+ * overwritten. its only called here to ensure that the global and this
+ * function are linked into the loader */
+ BL bsp_slot_init_split_application
+
/* Loop to copy data from read only memory to RAM. The ranges
* of copy from/to are specified by following symbols evaluated in
* linker script.
@@ -173,11 +178,6 @@ Reset_Handler:
LDR R1, =__HeapLimit
BL _sbrkInit
- /* This is called but current_slot is in the data section so it is
- * overwritten. its only called here to ensure that the global and this
- * function are linked into the loader */
- BL bsp_slot_init_split_application
-
LDR R0, =SystemInit
BLX R0
LDR R0, =_start
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/260a90eb/hw/bsp/nrf51dk-16kbram/src/arch/cortex_m0/gcc_startup_nrf51.s
----------------------------------------------------------------------
diff --git a/hw/bsp/nrf51dk-16kbram/src/arch/cortex_m0/gcc_startup_nrf51.s b/hw/bsp/nrf51dk-16kbram/src/arch/cortex_m0/gcc_startup_nrf51.s
index 89cee05..85086e2 100755
--- a/hw/bsp/nrf51dk-16kbram/src/arch/cortex_m0/gcc_startup_nrf51.s
+++ b/hw/bsp/nrf51dk-16kbram/src/arch/cortex_m0/gcc_startup_nrf51.s
@@ -149,6 +149,11 @@ Reset_Handler:
ORRS R2, R1
STR R2, [R0]
+ /* This is called but current_slot is in the data section so it is
+ * overwritten. its only called here to ensure that the global and this
+ * function are linked into the loader */
+ BL bsp_slot_init_split_application
+
/* Loop to copy data from read only memory to RAM. The ranges
* of copy from/to are specified by following symbols evaluated in
* linker script.
@@ -173,11 +178,6 @@ Reset_Handler:
LDR R1, =__HeapLimit
BL _sbrkInit
- /* This is called but current_slot is in the data section so it is
- * overwritten. its only called here to ensure that the global and this
- * function are linked into the loader */
- BL bsp_slot_init_split_application
-
LDR R0, =SystemInit
BLX R0
LDR R0, =_start
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/260a90eb/hw/bsp/nrf51dk/src/arch/cortex_m0/gcc_startup_nrf51.s
----------------------------------------------------------------------
diff --git a/hw/bsp/nrf51dk/src/arch/cortex_m0/gcc_startup_nrf51.s b/hw/bsp/nrf51dk/src/arch/cortex_m0/gcc_startup_nrf51.s
index 19ff3d8..0773621 100755
--- a/hw/bsp/nrf51dk/src/arch/cortex_m0/gcc_startup_nrf51.s
+++ b/hw/bsp/nrf51dk/src/arch/cortex_m0/gcc_startup_nrf51.s
@@ -149,6 +149,11 @@ Reset_Handler:
ORRS R2, R1
STR R2, [R0]
+ /* This is called but current_slot is in the data section so it is
+ * overwritten. its only called here to ensure that the global and this
+ * function are linked into the loader */
+ BL bsp_slot_init_split_application
+
/* Loop to copy data from read only memory to RAM. The ranges
* of copy from/to are specified by following symbols evaluated in
* linker script.
@@ -173,11 +178,6 @@ Reset_Handler:
LDR R1, =__HeapLimit
BL _sbrkInit
- /* This is called but current_slot is in the data section so it is
- * overwritten. its only called here to ensure that the global and this
- * function are linked into the loader */
- BL bsp_slot_init_split_application
-
LDR R0, =SystemInit
BLX R0
LDR R0, =_start
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/260a90eb/hw/bsp/nrf52dk/src/arch/cortex_m4/gcc_startup_nrf52.s
----------------------------------------------------------------------
diff --git a/hw/bsp/nrf52dk/src/arch/cortex_m4/gcc_startup_nrf52.s b/hw/bsp/nrf52dk/src/arch/cortex_m4/gcc_startup_nrf52.s
index 033f227..de2a2fa 100755
--- a/hw/bsp/nrf52dk/src/arch/cortex_m4/gcc_startup_nrf52.s
+++ b/hw/bsp/nrf52dk/src/arch/cortex_m4/gcc_startup_nrf52.s
@@ -138,6 +138,10 @@ __isr_vector:
Reset_Handler:
.fnstart
+ /* This is called but current_slot is in the data section so it is
+ * overwritten. its only called here to ensure that the global and this
+ * function are linked into the loader */
+ BL bsp_slot_init_split_application
/* Loop to copy data from read only memory to RAM. The ranges
* of copy from/to are specified by following symbols evaluated in
@@ -168,11 +172,6 @@ Reset_Handler:
LDR R0, =SystemInit
BLX R0
- /* This is called but current_slot is in the data section so it is
- * overwritten. its only called here to ensure that the global and this
- * function are linked into the loader */
- BL bsp_slot_init_split_application
-
LDR R0, =_start
BX R0