From 9333f3778f2c4b49db25e0119d3077d58af77146 Mon Sep 17 00:00:00 2001
From: bsongis <bsongis@gmail.com>
Date: Tue, 1 Jul 2014 15:59:00 +0200
Subject: [PATCH] The check on the BL size was wrong as it didn't take care of
 the _bootStart() function size

---
 radio/src/Makefile                          | 1 -
 radio/src/loadboot.cpp                      | 5 +++--
 radio/src/targets/taranis/stm32_flash_bl.ld | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/radio/src/Makefile b/radio/src/Makefile
index df412f8f0..4c0fd8418 100644
--- a/radio/src/Makefile
+++ b/radio/src/Makefile
@@ -1149,7 +1149,6 @@ endif
 # build bootloader
 ifeq ($(PCB), TARANIS)
 bootloader.lbm: bootloader/bootloader_ramBoot.bin
-	test -z "$$(find $^ -size +32k)"
 	$(BIN2LBM) $^ $@
 
 .PHONY bootloader/bootloader_ramBoot.bin:
diff --git a/radio/src/loadboot.cpp b/radio/src/loadboot.cpp
index 947b75d05..c8e7ebd42 100644
--- a/radio/src/loadboot.cpp
+++ b/radio/src/loadboot.cpp
@@ -71,8 +71,9 @@ void _bootStart(void);
 
 #if defined(PCBTARANIS)
 __attribute__ ((section(".isr_boot_vector"), used))
-const uint32_t BootVectors[] = { (uint32_t) &_estack,
-    (uint32_t) (void (*)(void)) ((unsigned long) &_bootStart) };
+const uint32_t BootVectors[] = {
+  (uint32_t) &_estack,
+  (uint32_t) (void (*)(void)) ((unsigned long) &_bootStart) };
 #endif
 
 #if defined(PCBTARANIS)
diff --git a/radio/src/targets/taranis/stm32_flash_bl.ld b/radio/src/targets/taranis/stm32_flash_bl.ld
index da01f5785..4ff28f4db 100644
--- a/radio/src/targets/taranis/stm32_flash_bl.ld
+++ b/radio/src/targets/taranis/stm32_flash_bl.ld
@@ -15,7 +15,7 @@
 **
 **  Environment : Atollic TrueSTUDIO(R)
 **
-**  Distribution: The file is distributed “as is,” without any warranty
+**  Distribution: The file is distributed �as is,� without any warranty
 **                of any kind.
 **
 **  (c)Copyright Atollic AB.
@@ -63,7 +63,7 @@ SECTIONS
     *(.bootrodata)
     *(.bootrodata.*)
       
-    . = ALIGN(32768);    /* Align the start of the main program */
+    . = 32768;           /* Set the start of the main program */
     _stext = .;          /* Provide the name for the start of this section */
 	 . = ALIGN(4);
     KEEP(*(.isr_vector)) /* Startup code */