From 4a528f5f5db93feea55664c01fe2dbcf7838e3ad Mon Sep 17 00:00:00 2001
From: utzig <utzig@35acf78f-673a-0410-8e92-d51de3d6d3f4>
Date: Sat, 11 Jul 2015 12:43:47 +0000
Subject: [PATCH] [AVR] Removed spurious includes, better include paths

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@8075 35acf78f-673a-0410-8e92-d51de3d6d3f4
---
 demos/AVR/NIL-ARDUINOMEGA/Makefile | 10 +++++-----
 demos/AVR/RT-ARDUINOMEGA/Makefile  |  8 ++++----
 os/hal/ports/AVR/st_lld.h          |  3 ---
 3 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/demos/AVR/NIL-ARDUINOMEGA/Makefile b/demos/AVR/NIL-ARDUINOMEGA/Makefile
index dbdf1beef..9c2f14a3e 100644
--- a/demos/AVR/NIL-ARDUINOMEGA/Makefile
+++ b/demos/AVR/NIL-ARDUINOMEGA/Makefile
@@ -64,16 +64,16 @@ include $(CHIBIOS)/os/hal/ports/AVR/platform.mk
 include $(CHIBIOS)/os/hal/osal/nil/osal.mk
 include $(CHIBIOS)/os/nil/nil.mk
 include $(CHIBIOS)/os/nil/ports/AVR/compilers/GCC/mk/port.mk
-#include $(CHIBIOS)/test/rt/test.mk
+include $(CHIBIOS)/test/nil/test.mk
 
 # List C source files here. (C dependencies are automatically generated.)
-SRC = $(PORTSRC) \
-      $(KERNSRC) \
-      $(TESTSRC) \
-      $(HALSRC) \
+SRC = $(KERNSRC) \
+      $(PORTSRC) \
       $(OSALSRC) \
+      $(HALSRC) \
       $(PLATFORMSRC) \
       $(BOARDSRC) \
+      $(TESTSRC) \
       main.c
 
 # List C++ source files here. (C dependencies are automatically generated.)
diff --git a/demos/AVR/RT-ARDUINOMEGA/Makefile b/demos/AVR/RT-ARDUINOMEGA/Makefile
index f6ed4629f..a4d4bd621 100644
--- a/demos/AVR/RT-ARDUINOMEGA/Makefile
+++ b/demos/AVR/RT-ARDUINOMEGA/Makefile
@@ -67,13 +67,13 @@ include $(CHIBIOS)/os/rt/ports/AVR/compilers/GCC/mk/port.mk
 include $(CHIBIOS)/test/rt/test.mk
 
 # List C source files here. (C dependencies are automatically generated.)
-SRC = $(PORTSRC) \
-      $(KERNSRC) \
-      $(TESTSRC) \
-      $(HALSRC) \
+SRC = $(KERNSRC) \
+      $(PORTSRC) \
       $(OSALSRC) \
+      $(HALSRC) \
       $(PLATFORMSRC) \
       $(BOARDSRC) \
+      $(TESTSRC) \
       $(CHIBIOS)/os/various/evtimer.c \
       main.c
 
diff --git a/os/hal/ports/AVR/st_lld.h b/os/hal/ports/AVR/st_lld.h
index eccc9bfde..871d5ca4a 100644
--- a/os/hal/ports/AVR/st_lld.h
+++ b/os/hal/ports/AVR/st_lld.h
@@ -27,9 +27,6 @@
 #ifndef _ST_LLD_H_
 #define _ST_LLD_H_
 
-#include "mcuconf.h"
-#include "avr_timers.h"
-
 /*===========================================================================*/
 /* Driver constants.                                                         */
 /*===========================================================================*/