git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@298 35acf78f-673a-0410-8e92-d51de3d6d3f4

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
 

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))

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.