piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Mike's bootloader sources + added as option, for Taranis only for now (not as clean as it could be, bootloader is always built even if not selected - didn't find how to nest ifs in makefile :\ ) (Issue #546)

Browse Source
This commit is contained in:
Andre Bernet
2014-01-18 20:00:31 +01:00
parent 34776b24c0
commit 229dfc1938
159 changed files with 66903 additions and 2000 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/loadboot.cpp
+27 -36
View File
@@ -47,28 +47,32 @@
#include <stdint.h>
//#include "lcd.h"
#ifdef PCBSKY
#include "AT91SAM3S4.h"
#endif
#ifdef PCBTARANIS
#include "stm32f2xx.h"
#include "stm32f2xx_gpio.h"
#include "stm32f2xx.h"
#include "stm32f2xx_gpio.h"
#else
#ifdef PCBX9D
#include "x9d\stm32f2xx.h"
#include "x9d\stm32f2xx_gpio.h"
#endif
#endif
#if defined(PCBX9D) || defined(PCBTARANIS)
void bwdt_reset()
{
IWDG->KR = 0xAAAA ; // reload
}
#endif
#ifdef PCBTARANIS
//#include "lcd.h"
#if defined(PCBX9D) || defined(PCBTARANIS)
__attribute__ ((section(".bootrodata"), used))
void _bootStart( void ) ;
__attribute__ ((section(".isr_boot_vector"), used))
const uint32_t BootVectors[] = {
(uint32_t)&_estack,
@@ -76,7 +80,7 @@ const uint32_t BootVectors[] = {
} ;
#endif
#ifdef PCBTARANIS
#if defined(PCBX9D) || defined(PCBTARANIS)
__attribute__ ((section(".bootrodata.*"), used))
#endif
@@ -85,39 +89,13 @@ __attribute__ ((section(".bootrodata"), used))
#endif
const uint8_t BootCode[] = {
#ifdef PCBTARANIS
#include "bootflashX.lbm"
#else
#ifdef REVX
#include "bootflash8.lbm"
#else
#include "bootflash4.lbm"
#endif
#endif
#include "bootloader.lbm"
} ;
#ifdef PCBTARANIS
#if defined(PCBX9D) || defined(PCBTARANIS)
__attribute__ ((section(".bootrodata"), used))
static void run_application( void ) ;
static void run_application()
{
asm(" mov.w r1, #134217728"); // 0x8000000
asm(" add.w r1, #32768"); // 0x8000
asm(" movw r0, #60680"); // 0xED08
asm(" movt r0, #57344"); // 0xE000
asm(" str r1, [r0, #0]"); // Set the VTOR
asm("ldr r0, [r1, #0]"); // Stack pointer value
asm("msr msp, r0"); // Set it
asm("ldr r0, [r1, #4]"); // Reset address
asm("mov.w r1, #1");
asm("orr r0, r1"); // Set lsbit
asm("bx r0"); // Execute application
}
void _bootStart()
{
@@ -161,7 +139,20 @@ void _bootStart()
}
}
run_application() ;
// run_application() ;
asm(" mov.w r1, #134217728"); // 0x8000000
asm(" add.w r1, #32768"); // 0x8000
asm(" movw r0, #60680"); // 0xED08
asm(" movt r0, #57344"); // 0xE000
asm(" str r1, [r0, #0]"); // Set the VTOR
asm("ldr r0, [r1, #0]"); // Stack pointer value
asm("msr msp, r0"); // Set it
asm("ldr r0, [r1, #4]"); // Reset address
asm("mov.w r1, #1");
asm("orr r0, r1"); // Set lsbit
asm("bx r0"); // Execute application
}
#endif