]> cloudbase.mooo.com Git - z180-stamp.git/commitdiff
Merge branch 'test-fboot-support'
authorLeo C <erbl259-lmu@yahoo.de>
Mon, 18 May 2015 08:06:49 +0000 (10:06 +0200)
committerLeo C <erbl259-lmu@yahoo.de>
Mon, 18 May 2015 08:06:49 +0000 (10:06 +0200)
1  2 
avr/command_tbl.c
avr/main.c
include/config.h

Simple merge
diff --cc avr/main.c
index 5a0d7928ea4b45aa9c7822d04dc84c1cd7ed1fe4,f4d4c6ff0b6b2d484b03b23f4e47cc7517f8139a..3852e754a5ba59477cf813421ebfcc36fea0f3c2
  #include "gpio.h"
  #include "time.h"
  #include "rtc.h"
 +#include "debug.h"
  
static uint8_t mcusr;
uint8_t mcusr __attribute__ ((section (".noinit")));
  
- /*--------------------------------------------------------------------------*/
  #if DEBUG
  __attribute__ ((naked)) __attribute__ ((section (".init3")))
  void preset_ram (void)
  {
Simple merge