aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>2008-05-20 12:18:35 +0000
committergdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>2008-05-20 12:18:35 +0000
commitb5a6f8abec0c55b226ee703efedc0679b8eb9f0b (patch)
tree7243e2b26725eed0098bfc6e64cb3b8b9ec88786
parenta891e966ae454bc1554e29166624969062104381 (diff)
downloadChibiOS-b5a6f8abec0c55b226ee703efedc0679b8eb9f0b.tar.gz
ChibiOS-b5a6f8abec0c55b226ee703efedc0679b8eb9f0b.tar.bz2
ChibiOS-b5a6f8abec0c55b226ee703efedc0679b8eb9f0b.zip
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@298 35acf78f-673a-0410-8e92-d51de3d6d3f4
-rw-r--r--demos/ARM7-AT91SAM7X-GCC/Makefile3
-rw-r--r--demos/ARM7-AT91SAM7X-GCC/board.c3
-rw-r--r--demos/ARM7-AT91SAM7X-GCC/main.c3
3 files changed, 3 insertions, 6 deletions
diff --git a/demos/ARM7-AT91SAM7X-GCC/Makefile b/demos/ARM7-AT91SAM7X-GCC/Makefile
index c799658c8..0ff70ca56 100644
--- a/demos/ARM7-AT91SAM7X-GCC/Makefile
+++ b/demos/ARM7-AT91SAM7X-GCC/Makefile
@@ -64,7 +64,6 @@ UADEFS =
# List ARM-mode C source files here
ASRC = ../../ports/ARM7-AT91SAM7X/chcore.c \
../../ports/ARM7-AT91SAM7X/sam7x_serial.c \
- ../../ports/ARM7-AT91SAM7X/sam7x_emac.c \
../../src/chinit.c ../../src/chdebug.c ../../src/chlists.c ../../src/chdelta.c \
../../src/chschd.c ../../src/chthreads.c ../../src/chsem.c ../../src/chmtx.c \
../../src/chevents.c ../../src/chmsg.c ../../src/chsleep.c ../../src/chqueues.c \
@@ -102,7 +101,7 @@ TOPT = -mthumb -D THUMB
# chconf.h.
# NOTE: -falign-functions=16 may improve the performance, not always, but
# increases the code size.
-OPT = -ggdb -fomit-frame-pointer -mabi=apcs-gnu
+OPT = -O2 -ggdb -fomit-frame-pointer -mabi=apcs-gnu
#OPT += -ffixed-r7
#OPT += -falign-functions=16
diff --git a/demos/ARM7-AT91SAM7X-GCC/board.c b/demos/ARM7-AT91SAM7X-GCC/board.c
index ff7e9dc19..4bc78f086 100644
--- a/demos/ARM7-AT91SAM7X-GCC/board.c
+++ b/demos/ARM7-AT91SAM7X-GCC/board.c
@@ -20,9 +20,10 @@
#include <ch.h>
#include "board.h"
-#include "sam7x_serial.h"
#include "at91lib/aic.h"
+#include <sam7x_serial.h>
+
extern void FiqHandler(void);
__attribute__((naked))
diff --git a/demos/ARM7-AT91SAM7X-GCC/main.c b/demos/ARM7-AT91SAM7X-GCC/main.c
index 2ac2f7e08..e5c2e7d4f 100644
--- a/demos/ARM7-AT91SAM7X-GCC/main.c
+++ b/demos/ARM7-AT91SAM7X-GCC/main.c
@@ -22,7 +22,6 @@
#include "board.h"
#include <sam7x_serial.h>
-#include <sam7x_emac.h>
static WorkingArea(waThread1, 64);
static msg_t Thread1(void *arg) {
@@ -41,8 +40,6 @@ static msg_t Thread1(void *arg) {
*/
int main(int argc, char **argv) {
- InitEMAC(AT91C_AIC_PRIOR_HIGHEST - 3);
-
/*
* The main() function becomes a thread here then the interrupts are
* enabled and ChibiOS/RT goes live.