aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDimitri Sokolyuk <demon@dim13.org>2012-03-13 12:56:45 +0000
committerDimitri Sokolyuk <demon@dim13.org>2012-03-13 12:56:45 +0000
commit533205510c8910c302ac750601f8abfacd659ab9 (patch)
tree3e9207baddc223fd64dfd50f751d9ce86ba62722
parent0c7070b409e724236f86b0d995f815b2dd02b900 (diff)
inculdes order
-rw-r--r--firmware/Makefile2
-rw-r--r--firmware/firmware.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/firmware/Makefile b/firmware/Makefile
index 46b8d28..cd7975a 100644
--- a/firmware/Makefile
+++ b/firmware/Makefile
@@ -16,7 +16,7 @@ OBJCOPY= avr-objcopy
OBJDUMP= avr-objdump
SIZE= avr-size
-CFLAGS= -Wall -Os -mmcu=${MCU_TARGET} \
+CFLAGS= -mmcu=${MCU_TARGET} -Wall -Os \
-DF_CPU=${F_CPU} -DPRESCALE=${PRESCALE} -DBAUD=${BAUD}
LDFLAGS= -mmcu=${MCU_TARGET} \
-Wl,-Map,${PROG}.map,--section-start=.text=${ORG}
diff --git a/firmware/firmware.c b/firmware/firmware.c
index d8e95a3..528c9e9 100644
--- a/firmware/firmware.c
+++ b/firmware/firmware.c
@@ -16,8 +16,8 @@
*/
#include <avr/io.h>
-#include <util/setbaud.h> /* depends on BAUD & F_CPU env vars */
#include <avr/boot.h>
+#include <util/setbaud.h> /* depends on BAUD & F_CPU env vars */
#define TIMEOUT (F_CPU / PRESCALE) /* 1 sec */
#define PUTCH(c) do { loop_until_bit_is_set(UCSRA, UDRE); UDR = (c); } while (0)
@@ -94,7 +94,7 @@ main(void)
reboot:
boot_rww_enable();
- ((void(*)(void))0)(); /* jump to app */
+ ((void(*)(void))0)();
/* NOTREACHED */
return 0;