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

Mike's bootloader added

Browse Source
This commit is contained in:
Andre Bernet
2014-01-16 00:02:18 +01:00
parent 006eee1411
commit 34776b24c0
5 changed files with 2124 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/Makefile
+1
View File
@@ -614,6 +614,7 @@ ifeq ($(PCB), TARANIS)
CPPSRC += audio_arm.cpp
CPPSRC += targets/taranis/pwr_driver.cpp targets/taranis/pulses_driver.cpp targets/taranis/keys_driver.cpp targets/taranis/adc_driver.cpp targets/taranis/trainer_driver.cpp targets/taranis/audio_driver.cpp targets/taranis/delays.cpp targets/taranis/uart_driver.cpp targets/taranis/sport_driver.cpp
CPPSRC += bmp.cpp gui/view_channels.cpp gui/view_about.cpp gui/view_text.cpp
CPPSRC += loadboot.cpp
SRC += targets/taranis/STM32F2xx_StdPeriph_Lib_V1.1.0/Libraries/CMSIS/Device/ST/STM32F2xx/Source/Templates/system_stm32f2xx.c
SRC += targets/taranis/STM32F2xx_StdPeriph_Lib_V1.1.0/Libraries/STM32F2xx_StdPeriph_Driver/src/misc.c
SRC += targets/taranis/STM32F2xx_StdPeriph_Lib_V1.1.0/Libraries/STM32F2xx_StdPeriph_Driver/src/stm32f2xx_gpio.c
radio/src/bootflashX.lbm
+1939
View File
File diff suppressed because it is too large Load Diff
radio/src/loadboot.cpp
+168
View File
@@ -0,0 +1,168 @@
/****************************************************************************
* Copyright (c) 2014 by Michael Blandford. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. Neither the name of the author nor the names of its contributors may
* be used to endorse or promote products derived from this software
* without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
* THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
* OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
* AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
* THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
****************************************************************************
* Other Authors:
* - Andre Bernet
* - Bertrand Songis
* - Bryan J. Rentoul (Gruvin)
* - Cameron Weeks
* - Erez Raviv
* - Jean-Pierre Parisy
* - Karl Szmutny
* - Michal Hlavinka
* - Pat Mackenzie
* - Philip Moss
* - Rob Thomson
* - Romolo Manfredini
* - Thomas Husterer
*
****************************************************************************/
#include <stdint.h>
//#include "lcd.h"
#ifdef PCBSKY
#include "AT91SAM3S4.h"
#endif
#ifdef PCBTARANIS
#include "stm32f2xx.h"
#include "stm32f2xx_gpio.h"
void bwdt_reset()
{
IWDG->KR = 0xAAAA ; // reload
}
#endif
#ifdef PCBTARANIS
//#include "lcd.h"
__attribute__ ((section(".bootrodata"), used))
void _bootStart( void ) ;
__attribute__ ((section(".isr_boot_vector"), used))
const uint32_t BootVectors[] = {
(uint32_t)&_estack,
(uint32_t)(void (*)(void))((unsigned long)&_bootStart)
} ;
#endif
#ifdef PCBTARANIS
__attribute__ ((section(".bootrodata.*"), used))
#endif
#ifdef PCBSKY
__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
} ;
#ifdef 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()
{
RCC->AHB1ENR |= RCC_AHB1ENR_GPIOCEN ; // Enable portC clock
RCC->AHB1ENR |= RCC_AHB1ENR_GPIOEEN ; // Enable portE clock
GPIOC->PUPDR = 0x00000004 ;
GPIOE->PUPDR = 0x00000040 ;
uint32_t i ;
for ( i = 0 ; i < 50000 ; i += 1 )
{
bwdt_reset() ;
}
if ( (GPIOE->IDR & 0x00000008 ) == 0 )
{
if ( (GPIOC->IDR & 0x00000002 ) == 0 )
{
// Bootloader needed
const uint8_t *src ;
uint8_t *dest ;
uint32_t size ;
bwdt_reset() ;
size = sizeof(BootCode) ;
src = BootCode ;
dest = (uint8_t *)0x20000000 ;
for ( ; size ; size -= 1 )
{
*dest++ = *src++ ;
}
// Could check for a valid copy to RAM here
// Go execute bootloader
bwdt_reset() ;
uint32_t address = *(uint32_t *)0x20000004 ;
((void (*)(void)) (address))() ; // Go execute the loaded application
}
}
run_application() ;
}
#endif
radio/src/targets/taranis/STM32F2xx_StdPeriph_Lib_V1.1.0/Libraries/CMSIS/Device/ST/STM32F2xx/Source/Templates/system_stm32f2xx.c
+3 -1
View File
@@ -232,7 +232,9 @@ void SystemInit(void)
#ifdef VECT_TAB_SRAM
SCB->VTOR = SRAM_BASE | VECT_TAB_OFFSET; /* Vector Table Relocation in Internal SRAM */
#else
SCB->VTOR = FLASH_BASE | VECT_TAB_OFFSET; /* Vector Table Relocation in Internal FLASH */
// SCB->VTOR = FLASH_BASE | VECT_TAB_OFFSET; /* Vector Table Relocation in Internal FLASH */
extern uint32_t g_pfnVectors ;
SCB->VTOR = (uint32_t) &g_pfnVectors ; /* Vector Table Relocation in Internal FLASH */
#endif
}
radio/src/targets/taranis/stm32_flash.ld
+13 -2
View File
@@ -32,6 +32,9 @@
/* Entry Point */
ENTRY(Reset_Handler)
/* Highest address of the user mode stack */
_estack = 0x20020000; /* end of 128K SRAM */
/* Generate a link error if heap and stack don't fit into RAM */
_Min_Heap_Size = 0; /* required amount of heap */
_Min_Stack_Size = 0x200; /* required amount of stack */
@@ -52,6 +55,16 @@ SECTIONS
/* The program code and other data goes into FLASH */
.text :
{
FILL(0xFFFF)
CREATE_OBJECT_SYMBOLS
KEEP(*(.isr_boot_vector)) /* Startup code */
*(.bootrodata)
*(.bootrodata.*)
. = ALIGN(32768); /* Align the start of the main program */
_stext = .; /* Provide the name for the start of this section */
. = ALIGN(4);
KEEP(*(.isr_vector)) /* Startup code */
*(.text) /* .text sections (code) */
@@ -141,8 +154,6 @@ SECTIONS
. = ALIGN(4);
} >RAM
PROVIDE ( _estack = ORIGIN(RAM) + LENGTH(RAM) );
/* MEMORY_bank1 section, code must be located here explicitly */
/* Example: extern int foo(void) __attribute__ ((section (".mb1text"))); */
.memory_b1_text :