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/01 19:14:14 UTC
incubator-mynewt-core git commit: MYNEWT-317
Repository: incubator-mynewt-core
Updated Branches:
refs/heads/develop 1e3a96db4 -> 0f85cf5a9
MYNEWT-317
add a comment to why we have this function in the startup code for the loader.
Its a weird artifact of an error in the linking that will be addressed in another bug
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/0f85cf5a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/0f85cf5a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/0f85cf5a
Branch: refs/heads/develop
Commit: 0f85cf5a9beb733ed7feb0def36dbfa1f0d6c312
Parents: 1e3a96d
Author: Paul Dietrich <pa...@yahoo.com>
Authored: Thu Sep 1 12:13:05 2016 -0700
Committer: Paul Dietrich <pa...@yahoo.com>
Committed: Thu Sep 1 12:14:07 2016 -0700
----------------------------------------------------------------------
.../arduino_primo_nrf52/src/arch/cortex_m4/gcc_startup_nrf52.s | 5 +++--
hw/bsp/bmd300eval/src/arch/cortex_m4/gcc_startup_nrf52.s | 5 +++--
hw/bsp/nrf51-blenano/src/arch/cortex_m0/gcc_startup_nrf51.s | 3 +++
hw/bsp/nrf51dk-16kbram/src/arch/cortex_m0/gcc_startup_nrf51.s | 3 +++
hw/bsp/nrf51dk/src/arch/cortex_m0/gcc_startup_nrf51.s | 3 +++
hw/bsp/nrf52dk/src/arch/cortex_m4/gcc_startup_nrf52.s | 5 +++--
6 files changed, 18 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/0f85cf5a/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 6848ae3..033f227 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
@@ -168,9 +168,10 @@ Reset_Handler:
LDR R0, =SystemInit
BLX R0
-#ifdef SPLIT_APPLICATION
+ /* 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
-#endif
LDR R0, =_start
BX R0
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/0f85cf5a/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 6848ae3..033f227 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
@@ -168,9 +168,10 @@ Reset_Handler:
LDR R0, =SystemInit
BLX R0
-#ifdef SPLIT_APPLICATION
+ /* 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
-#endif
LDR R0, =_start
BX R0
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/0f85cf5a/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 515e30f..19ff3d8 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
@@ -173,6 +173,9 @@ 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
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/0f85cf5a/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 0a88c21..89cee05 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
@@ -173,6 +173,9 @@ 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
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/0f85cf5a/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 515e30f..19ff3d8 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
@@ -173,6 +173,9 @@ 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
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/0f85cf5a/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 6848ae3..033f227 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
@@ -168,9 +168,10 @@ Reset_Handler:
LDR R0, =SystemInit
BLX R0
-#ifdef SPLIT_APPLICATION
+ /* 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
-#endif
LDR R0, =_start
BX R0