Repository: incubator-mynewt-core Updated Branches: refs/heads/develop 0b0f1eb64 -> e550b59ed
No ticket: Image state commit - fix compiler errors 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/e550b59e Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/e550b59e Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/e550b59e Branch: refs/heads/develop Commit: e550b59ed25f7f67738f5b5769b3dd169b7f16a3 Parents: 0b0f1eb Author: Vipul Rahane <vipulrah...@apache.org> Authored: Thu Oct 13 14:26:41 2016 -0700 Committer: Vipul Rahane <vipulrah...@apache.org> Committed: Thu Oct 13 14:26:41 2016 -0700 ---------------------------------------------------------------------- hw/bsp/rb-nano2/src/arch/cortex_m4/gcc_startup_nrf52.s | 5 ----- hw/bsp/rb-nano2/src/arch/cortex_m4/gcc_startup_nrf52_split.s | 2 -- 2 files changed, 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/e550b59e/hw/bsp/rb-nano2/src/arch/cortex_m4/gcc_startup_nrf52.s ---------------------------------------------------------------------- diff --git a/hw/bsp/rb-nano2/src/arch/cortex_m4/gcc_startup_nrf52.s b/hw/bsp/rb-nano2/src/arch/cortex_m4/gcc_startup_nrf52.s index 54b76ad..fb804fd 100755 --- a/hw/bsp/rb-nano2/src/arch/cortex_m4/gcc_startup_nrf52.s +++ b/hw/bsp/rb-nano2/src/arch/cortex_m4/gcc_startup_nrf52.s @@ -138,11 +138,6 @@ __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 boot_set_image_slot_split - /* 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. http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/e550b59e/hw/bsp/rb-nano2/src/arch/cortex_m4/gcc_startup_nrf52_split.s ---------------------------------------------------------------------- diff --git a/hw/bsp/rb-nano2/src/arch/cortex_m4/gcc_startup_nrf52_split.s b/hw/bsp/rb-nano2/src/arch/cortex_m4/gcc_startup_nrf52_split.s index 26bb3a8..7426848 100755 --- a/hw/bsp/rb-nano2/src/arch/cortex_m4/gcc_startup_nrf52_split.s +++ b/hw/bsp/rb-nano2/src/arch/cortex_m4/gcc_startup_nrf52_split.s @@ -136,8 +136,6 @@ Reset_Handler_split: LDR R1, =__HeapLimit BL _sbrkInit - BL boot_set_image_slot_split - LDR R0, =SystemInit BLX R0 LDR R0, =_start
