mirror of
https://github.com/oliverschmidt/contiki.git
synced 2024-09-09 23:54:32 +00:00
avr/bootloader.c: Now compatible with bootloaders which always run first.
The boot loader now knows when to go into bootstrap mode by looking for a specific EEPROM value. Also updated code style to match Contiki code style guidelines.
This commit is contained in:
parent
5df586e09d
commit
9c17a542a7
@ -5,69 +5,99 @@
|
|||||||
#include <avr/interrupt.h>
|
#include <avr/interrupt.h>
|
||||||
#include <avr/pgmspace.h>
|
#include <avr/pgmspace.h>
|
||||||
#include "dev/usb/usb_drv.h"
|
#include "dev/usb/usb_drv.h"
|
||||||
|
#include <avr/pgmspace.h>
|
||||||
|
#include <avr/interrupt.h>
|
||||||
|
#include <avr/eeprom.h>
|
||||||
|
|
||||||
//Not all AVR toolchains alias MCUSR to the older MSUSCR name
|
/* Not all AVR toolchains alias MCUSR to the older MSUSCR name */
|
||||||
//#if defined (__AVR_ATmega8__) || defined (__AVR_ATmega8515__) || defined (__AVR_ATmega16__)
|
|
||||||
#if !defined (MCUSR) && defined (MCUCSR)
|
#if !defined (MCUSR) && defined (MCUCSR)
|
||||||
#warning *** MCUSR not defined, using MCUCSR instead ***
|
#warning *** MCUSR not defined, using MCUCSR instead ***
|
||||||
#define MCUSR MCUCSR
|
#define MCUSR MCUCSR
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifndef EEPROM_MAGIC_BYTE_ADDR
|
||||||
|
#define EEPROM_MAGIC_BYTE_ADDR (uint8_t*)(E2END-3)
|
||||||
|
#endif
|
||||||
|
|
||||||
volatile uint32_t Boot_Key ATTR_NO_INIT;
|
volatile uint32_t Boot_Key ATTR_NO_INIT;
|
||||||
|
|
||||||
|
extern void Bootloader_Jump_Check(void) ATTR_INIT_SECTION(3);
|
||||||
|
|
||||||
bool
|
bool
|
||||||
bootloader_is_present(void) {
|
bootloader_is_present(void)
|
||||||
#if defined(RAMPZ)
|
{
|
||||||
return pgm_read_word_far(BOOTLOADER_START_ADDRESS)!=0xFFFF;
|
#if defined(BOOTLOADER_START_ADDRESS)
|
||||||
|
return pgm_read_word_far(BOOTLOADER_START_ADDRESS) != 0xFFFF;
|
||||||
#else
|
#else
|
||||||
/* Probably can just return false when < 64K flash */
|
|
||||||
// return pgm_read_word_near(BOOTLOADER_START_ADDRESS)!=0xFFFF;
|
|
||||||
return false;
|
return false;
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
Jump_To_Bootloader(void)
|
Jump_To_Bootloader(void)
|
||||||
{
|
{
|
||||||
uint8_t i;
|
/* Disable all interrupts */
|
||||||
|
|
||||||
#ifdef UDCON
|
|
||||||
// If USB is used, detach from the bus
|
|
||||||
Usb_detach();
|
|
||||||
#endif
|
|
||||||
|
|
||||||
// Disable all interrupts
|
|
||||||
cli();
|
cli();
|
||||||
|
|
||||||
// Set the bootloader key to the magic value and force a reset
|
#ifdef UDCON
|
||||||
|
/* If USB is used, detach from the bus */
|
||||||
|
Usb_detach();
|
||||||
|
|
||||||
|
uint8_t i;
|
||||||
|
|
||||||
|
/* Wait two seconds for the USB detachment to register on the host */
|
||||||
|
for(i = 0; i < 200; i++) {
|
||||||
|
_delay_ms(10);
|
||||||
|
watchdog_periodic();
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/* Set the bootloader key to the magic value and force a reset */
|
||||||
Boot_Key = MAGIC_BOOT_KEY;
|
Boot_Key = MAGIC_BOOT_KEY;
|
||||||
|
|
||||||
// Wait two seconds for the USB detachment to register on the host
|
eeprom_write_byte(EEPROM_MAGIC_BYTE_ADDR, 0xFF);
|
||||||
for (i = 0; i < 128; i++)
|
|
||||||
_delay_ms(16);
|
|
||||||
|
|
||||||
// Set the bootloader key to the magic value and force a reset
|
/* Enable interrupts */
|
||||||
Boot_Key = MAGIC_BOOT_KEY;
|
sei();
|
||||||
|
|
||||||
watchdog_reboot();
|
watchdog_reboot();
|
||||||
}
|
}
|
||||||
|
|
||||||
extern void Bootloader_Jump_Check(void) ATTR_INIT_SECTION(3);
|
|
||||||
|
|
||||||
void
|
void
|
||||||
Bootloader_Jump_Check(void)
|
Bootloader_Jump_Check(void)
|
||||||
{
|
{
|
||||||
// If the reset source was the bootloader and the key is correct, clear it and jump to the bootloader
|
/* If the reset source was the bootloader and the key is correct,
|
||||||
if(MCUSR & (1<<WDRF)) {
|
* clear it and jump to the bootloader
|
||||||
|
*/
|
||||||
|
if(MCUSR & (1 << WDRF)) {
|
||||||
MCUSR = 0;
|
MCUSR = 0;
|
||||||
if(Boot_Key == MAGIC_BOOT_KEY) {
|
if(Boot_Key == MAGIC_BOOT_KEY) {
|
||||||
Boot_Key = 0;
|
Boot_Key = 0;
|
||||||
wdt_disable();
|
wdt_disable();
|
||||||
|
|
||||||
((void (*)(void))BOOTLOADER_START_ADDRESS)();
|
/* Disable all interrupts */
|
||||||
|
cli();
|
||||||
|
|
||||||
|
eeprom_write_byte(EEPROM_MAGIC_BYTE_ADDR, 0xFF);
|
||||||
|
|
||||||
|
/* Enable interrupts */
|
||||||
|
sei();
|
||||||
|
|
||||||
|
((void (*)(void))(BOOTLOADER_START_ADDRESS)) ();
|
||||||
} else {
|
} else {
|
||||||
|
/* The watchdog fired. Probably means we
|
||||||
|
* crashed. Wait two seconds before continuing.
|
||||||
|
*/
|
||||||
|
|
||||||
Boot_Key++;
|
Boot_Key++;
|
||||||
|
uint8_t i;
|
||||||
|
|
||||||
|
for(i = 0; i < 200; i++) {
|
||||||
|
_delay_ms(10);
|
||||||
|
watchdog_periodic();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
Boot_Key = MAGIC_BOOT_KEY-4;
|
Boot_Key = MAGIC_BOOT_KEY - 4;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -2,6 +2,8 @@ CONTIKI_TARGET_DIRS = . apps net loader dev/usb dev/serial
|
|||||||
CONTIKI_CORE=contiki-raven-main
|
CONTIKI_CORE=contiki-raven-main
|
||||||
CONTIKI_TARGET_MAIN = ${CONTIKI_CORE}.o
|
CONTIKI_TARGET_MAIN = ${CONTIKI_CORE}.o
|
||||||
|
|
||||||
|
BOOTLOADER_START = 0x1F000
|
||||||
|
|
||||||
#USB Ethernet Interface + USB Serial Port TX Only
|
#USB Ethernet Interface + USB Serial Port TX Only
|
||||||
USB = uart_usb_lib.c \
|
USB = uart_usb_lib.c \
|
||||||
cdc_task.c \
|
cdc_task.c \
|
||||||
|
Loading…
Reference in New Issue
Block a user