BL: Call initial PC using raw asm

Gives the compiler no chance to insert garbage code. Before it was inserting in between setting MSP to initial SP and branching to initial PC: ldmia.w sp!, {r4, r5, r6, lr} (ldm = load multiple, ia = increment after... this tries to pop off the stack after setting SP to the new stack top)
d-ronin · Jul 3, 2017 · d93fd61 · d93fd61
1 parent 99d4cd2
commit d93fd61
Show file tree

Hide file tree

Showing 15 changed files with 27 additions and 34 deletions.
diff --git a/flight/targets/aq32/board-info/board-info.mk b/flight/targets/aq32/board-info/board-info.mk
@@ -1,12 +1,12 @@
 BOARD_TYPE          := 0x94
 BOARD_REVISION      := 0x01
-BOOTLOADER_VERSION  := 0x87
+BOOTLOADER_VERSION  := 0x88
 HW_TYPE             := 0x00
 
 CHIP                := STM32F407VGT6
 BOARD               := STM32F4xx_AQ32
 MODEL               := HD
-MODEL_SUFFIX        := 
+MODEL_SUFFIX        :=
 
 USB_VEND            := "AeroQuad"
 USB_PROD            := "AQ32"

diff --git a/flight/targets/bl/common/main.c b/flight/targets/bl/common/main.c
@@ -357,7 +357,7 @@ static void go_jumping_to_app(struct bl_fsm_context * context)
 	__set_MSP(initial_sp);
 
 	/* Jump to the application entry point */
-	((void (*)(void))initial_pc)();
+	asm volatile("bx %r0" : : "r" (initial_pc) : );
 }
 
 static void go_dfu_idle(struct bl_fsm_context * context)

diff --git a/flight/targets/brain/board-info/board-info.mk b/flight/targets/brain/board-info/board-info.mk
@@ -1,12 +1,12 @@
 BOARD_TYPE          := 0x8A
 BOARD_REVISION      := 0x01
-BOOTLOADER_VERSION  := 0x87
+BOOTLOADER_VERSION  := 0x88
 HW_TYPE             := 0x00		# seems to be unused
 
 CHIP                := STM32F405RGT
 BOARD               := STM32F4xx_BRAIN
 MODEL               := HD
-MODEL_SUFFIX        := 
+MODEL_SUFFIX        :=
 
 USB_VEND            := "BrainFPV"
 USB_PROD            := "BrainFPV"

diff --git a/flight/targets/brainre1/board-info/board-info.mk b/flight/targets/brainre1/board-info/board-info.mk
@@ -1,12 +1,12 @@
 BOARD_TYPE          := 0x8B
 BOARD_REVISION      := 0x01
-BOOTLOADER_VERSION  := 0x87
+BOOTLOADER_VERSION  := 0x88
 HW_TYPE             := 0x00		# seems to be unused
 
 CHIP                := STM32F446RET
 BOARD               := STM32F4xx_BRAINFPVRE1
 MODEL               := HD
-MODEL_SUFFIX        := 
+MODEL_SUFFIX        :=
 
 USB_VEND            := "BrainFPV"
 USB_PROD            := "RE1"
@@ -35,4 +35,3 @@ SYSCLK_FREQ         := 180000000
 # Include these here, so they get included in the firmware and bootloader
 SRC += $(BOARD_INFO_DIR)/../re1fpga/fpga_drv.c
 EXTRAINCDIRS += $(BOARD_INFO_DIR)/../re1fpga/
-
diff --git a/flight/targets/dtfc/board-info/board-info.mk b/flight/targets/dtfc/board-info/board-info.mk
@@ -1,12 +1,12 @@
 BOARD_TYPE          := 0xD7
 BOARD_REVISION      := 0x01
-BOOTLOADER_VERSION  := 0x87
+BOOTLOADER_VERSION  := 0x88
 HW_TYPE             := 0x00
 
 CHIP                := STM32F303VCT
 BOARD               := STM32F30x_DTFc
 MODEL               := HD
-MODEL_SUFFIX        := 
+MODEL_SUFFIX        :=
 
 USB_VEND            := "DTF Air"
 USB_PROD            := "DTFc"
@@ -31,4 +31,3 @@ EF_BANK_SIZE        := 0x00040000  # Size of the entire flash image (from bootlo
 
 OSCILLATOR_FREQ     :=   8000000
 SYSCLK_FREQ         :=  72000000
-
diff --git a/flight/targets/lux/board-info/board-info.mk b/flight/targets/lux/board-info/board-info.mk
@@ -1,12 +1,12 @@
 BOARD_TYPE          := 0xCA
 BOARD_REVISION      := 0x02
-BOOTLOADER_VERSION  := 0x87
+BOOTLOADER_VERSION  := 0x88
 HW_TYPE             := 0x00		# seems to be unused
 
 CHIP                := STM32F303VCT
 BOARD               := STM32F30x_lux
 MODEL               := HD
-MODEL_SUFFIX        := 
+MODEL_SUFFIX        :=
 
 USB_VEND            := "Lumenier"
 USB_PROD            := "LUX"
@@ -31,4 +31,3 @@ EF_BANK_SIZE        := 0x00040000  # Size of the entire flash image (from bootlo
 
 OSCILLATOR_FREQ     :=   8000000
 SYSCLK_FREQ         :=  72000000
-
diff --git a/flight/targets/pikoblx/board-info/board-info.mk b/flight/targets/pikoblx/board-info/board-info.mk
@@ -1,12 +1,12 @@
 BOARD_TYPE          := 0xA2
 BOARD_REVISION      := 0x01
-BOOTLOADER_VERSION  := 0x87
+BOOTLOADER_VERSION  := 0x88
 HW_TYPE             := 0x00		# seems to be unused
 
 CHIP                := STM32F303VCT
 BOARD               := STM32F30x_PIKOBLX
 MODEL               := HD
-MODEL_SUFFIX        := 
+MODEL_SUFFIX        :=
 
 USB_VEND            := "dRonin"
 USB_PROD            := "PikoBLX"
@@ -31,4 +31,3 @@ EF_BANK_SIZE        := 0x00040000  # Size of the entire flash image (from bootlo
 
 OSCILLATOR_FREQ     :=   8000000
 SYSCLK_FREQ         :=  72000000
-
diff --git a/flight/targets/pipxtreme/board-info/board-info.mk b/flight/targets/pipxtreme/board-info/board-info.mk
@@ -1,6 +1,6 @@
 BOARD_TYPE          := 0x03
 BOARD_REVISION      := 0x02
-BOOTLOADER_VERSION  := 0x87
+BOOTLOADER_VERSION  := 0x88
 HW_TYPE             := 0x01
 
 CHIP                := STM32F103CBT
@@ -28,4 +28,3 @@ EF_BANK_SIZE        := 0x00020000  # Size of the entire flash image (from bootlo
 
 OSCILLATOR_FREQ     :=   8000000
 SYSCLK_FREQ         :=  72000000
-
diff --git a/flight/targets/playuavosd/board-info/board-info.mk b/flight/targets/playuavosd/board-info/board-info.mk
@@ -1,6 +1,6 @@
 BOARD_TYPE          := 0xCB
 BOARD_REVISION      := 0x01
-BOOTLOADER_VERSION  := 0x87
+BOOTLOADER_VERSION  := 0x88
 HW_TYPE             := 0x00		# seems to be unused
 
 CHIP                := STM32F405RGT

diff --git a/flight/targets/quanton/board-info/board-info.mk b/flight/targets/quanton/board-info/board-info.mk
@@ -1,12 +1,12 @@
 BOARD_TYPE          := 0x86
 BOARD_REVISION      := 0x01
-BOOTLOADER_VERSION  := 0x87
+BOOTLOADER_VERSION  := 0x88
 HW_TYPE             := 0x00		# seems to be unused
 
 CHIP                := STM32F405RGT
 BOARD               := STM32F4xx_QUANTON
 MODEL               := HD
-MODEL_SUFFIX        := 
+MODEL_SUFFIX        :=
 
 USB_VEND            := "Quantec"
 USB_PROD            := "Quanton"

diff --git a/flight/targets/revolution/board-info/board-info.mk b/flight/targets/revolution/board-info/board-info.mk
@@ -1,12 +1,12 @@
 BOARD_TYPE          := 0x09
 BOARD_REVISION      := 0x03
-BOOTLOADER_VERSION  := 0x87
+BOOTLOADER_VERSION  := 0x88
 HW_TYPE             := 0x00
 
 CHIP                := STM32F405RGT
 BOARD               := STM32F4xx_RM
 MODEL               := HD
-MODEL_SUFFIX        := 
+MODEL_SUFFIX        :=
 
 USB_VEND            := "OpenPilot"
 USB_PROD            := "Revolution"

diff --git a/flight/targets/seppuku/board-info/board-info.mk b/flight/targets/seppuku/board-info/board-info.mk
@@ -1,12 +1,12 @@
 BOARD_TYPE          := 0xA1
 BOARD_REVISION      := 0x01
-BOOTLOADER_VERSION  := 0x88
+BOOTLOADER_VERSION  := 0x89
 HW_TYPE             := 0x00		# seems to be unused
 
 CHIP                := STM32F405RGT
 BOARD               := STM32F4xx_SEPPUKU
 MODEL               := HD
-MODEL_SUFFIX        := 
+MODEL_SUFFIX        :=
 
 USB_VEND            := "dRonin"
 USB_PROD            := "Seppuku"

diff --git a/flight/targets/sparky/board-info/board-info.mk b/flight/targets/sparky/board-info/board-info.mk
@@ -1,12 +1,12 @@
 BOARD_TYPE          := 0x88
 BOARD_REVISION      := 0x02
-BOOTLOADER_VERSION  := 0x87
+BOOTLOADER_VERSION  := 0x88
 HW_TYPE             := 0x00		# seems to be unused
 
 CHIP                := STM32F303VCT
 BOARD               := STM32F30x_SPARKY
 MODEL               := HD
-MODEL_SUFFIX        := 
+MODEL_SUFFIX        :=
 
 USB_VEND            := "Tau Labs"
 USB_PROD            := "Sparky"
@@ -31,4 +31,3 @@ EF_BANK_SIZE        := 0x00040000  # Size of the entire flash image (from bootlo
 
 OSCILLATOR_FREQ     :=   8000000
 SYSCLK_FREQ         :=  72000000
-
diff --git a/flight/targets/sparky2/board-info/board-info.mk b/flight/targets/sparky2/board-info/board-info.mk
@@ -1,12 +1,12 @@
 BOARD_TYPE          := 0x92
 BOARD_REVISION      := 0x01
-BOOTLOADER_VERSION  := 0x87
+BOOTLOADER_VERSION  := 0x88
 HW_TYPE             := 0x00
 
 CHIP                := STM32F405RGT
 BOARD               := STM32F4xx_RM
 MODEL               := HD
-MODEL_SUFFIX        := 
+MODEL_SUFFIX        :=
 
 USB_VEND            := "Tau Labs"
 USB_PROD            := "Sparky2"

diff --git a/flight/targets/sprf3e/board-info/board-info.mk b/flight/targets/sprf3e/board-info/board-info.mk
@@ -1,12 +1,12 @@
 BOARD_TYPE          := 0xCF
 BOARD_REVISION      := 0x02
-BOOTLOADER_VERSION  := 0x87
+BOOTLOADER_VERSION  := 0x88
 HW_TYPE             := 0x00		# seems to be unused
 
 CHIP                := STM32F303CCT
 BOARD               := STM32F30x_sprf3e
 MODEL               := HD
-MODEL_SUFFIX        := 
+MODEL_SUFFIX        :=
 
 USB_VEND            := "dRonin"
 USB_PROD            := "SPRF3E"
@@ -31,4 +31,3 @@ EF_BANK_SIZE        := 0x00040000  # Size of the entire flash image (from bootlo
 
 OSCILLATOR_FREQ     :=   8000000
 SYSCLK_FREQ         :=  72000000
-