AVR: Update the multi.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@11761 110e8d01-0319-4d1e-a829-52ad28d1bb01

25 files changed, 55 insertions, 64 deletions

diff --git a/testhal/AVR/multi/PAL/Makefile b/testhal/AVR/multi/PAL/Makefile
index 8e4fbfe87..2d54e41c1 100644
--- a/testhal/AVR/multi/PAL/Makefile
+++ b/testhal/AVR/multi/PAL/Makefile
@@ -5,31 +5,31 @@
 all:

 	@echo

 	@echo === Building for Arduino-Mega ======================================

-	@make --no-print-directory -f Makefile-arduino_mega all

+	@make --no-print-directory -f make/Makefile-arduino_mega.make all

 	@echo ====================================================================

 	@echo

 	@echo === Building for Arduino-Mini ======================================

-	@make --no-print-directory -f Makefile-arduino_mini all

+	@make --no-print-directory -f make/Makefile-arduino_mini.make all

 	@echo ====================================================================

 	@echo

 	@echo === Building for Arduino-Nano ======================================

-	@make --no-print-directory -f Makefile-arduino_nano all

+	@make --no-print-directory -f make/Makefile-arduino_nano.make all

 	@echo ====================================================================

 	@echo

 	@echo === Building for Arduino-Uno =======================================

-	@make --no-print-directory -f Makefile-arduino_uno all

+	@make --no-print-directory -f make/Makefile-arduino_uno.make all

 	@echo ====================================================================

 	@echo

 

 clean:

 	@echo

-	-@make --no-print-directory -f Makefile-arduino_mega clean

+	-@make --no-print-directory -f make/Makefile-arduino_mega.make clean

 	@echo

-	-@make --no-print-directory -f Makefile-arduino_mini clean

+	-@make --no-print-directory -f make/Makefile-arduino_mini.make clean

 	@echo

-	-@make --no-print-directory -f Makefile-arduino_nano clean

+	-@make --no-print-directory -f make/Makefile-arduino_nano.make clean

 	@echo

-	-@make --no-print-directory -f Makefile-arduino_uno clean

+	-@make --no-print-directory -f make/Makefile-arduino_uno.make clean

 	@echo

 

 #

diff --git a/testhal/AVR/multi/PAL/cfg-arduino_mega/chconf.h b/testhal/AVR/multi/PAL/cfg/arduino_mega/chconf.h
index 4ecd81a8e..4ecd81a8e 100644
--- a/testhal/AVR/multi/PAL/cfg-arduino_mega/chconf.h
+++ b/testhal/AVR/multi/PAL/cfg/arduino_mega/chconf.h
diff --git a/testhal/AVR/multi/PAL/cfg-arduino_mega/halconf.h b/testhal/AVR/multi/PAL/cfg/arduino_mega/halconf.h
index 8d1b79823..8d1b79823 100644
--- a/testhal/AVR/multi/PAL/cfg-arduino_mega/halconf.h
+++ b/testhal/AVR/multi/PAL/cfg/arduino_mega/halconf.h
diff --git a/testhal/AVR/multi/PAL/cfg-arduino_mega/mcuconf.h b/testhal/AVR/multi/PAL/cfg/arduino_mega/mcuconf.h
index 11aa69f22..11aa69f22 100644
--- a/testhal/AVR/multi/PAL/cfg-arduino_mega/mcuconf.h
+++ b/testhal/AVR/multi/PAL/cfg/arduino_mega/mcuconf.h
diff --git a/testhal/AVR/multi/PAL/cfg-arduino_mega/portab.c b/testhal/AVR/multi/PAL/cfg/arduino_mega/portab.c
index 6315515a0..6315515a0 100644
--- a/testhal/AVR/multi/PAL/cfg-arduino_mega/portab.c
+++ b/testhal/AVR/multi/PAL/cfg/arduino_mega/portab.c
diff --git a/testhal/AVR/multi/PAL/cfg-arduino_mega/portab.h b/testhal/AVR/multi/PAL/cfg/arduino_mega/portab.h
index a35f5db12..a35f5db12 100644
--- a/testhal/AVR/multi/PAL/cfg-arduino_mega/portab.h
+++ b/testhal/AVR/multi/PAL/cfg/arduino_mega/portab.h
diff --git a/testhal/AVR/multi/PAL/cfg-arduino_mini/chconf.h b/testhal/AVR/multi/PAL/cfg/arduino_mini/chconf.h
index 4ecd81a8e..4ecd81a8e 100644
--- a/testhal/AVR/multi/PAL/cfg-arduino_mini/chconf.h
+++ b/testhal/AVR/multi/PAL/cfg/arduino_mini/chconf.h
diff --git a/testhal/AVR/multi/PAL/cfg-arduino_mini/halconf.h b/testhal/AVR/multi/PAL/cfg/arduino_mini/halconf.h
index 8d1b79823..8d1b79823 100644
--- a/testhal/AVR/multi/PAL/cfg-arduino_mini/halconf.h
+++ b/testhal/AVR/multi/PAL/cfg/arduino_mini/halconf.h
diff --git a/testhal/AVR/multi/PAL/cfg-arduino_mini/mcuconf.h b/testhal/AVR/multi/PAL/cfg/arduino_mini/mcuconf.h
index 11aa69f22..11aa69f22 100644
--- a/testhal/AVR/multi/PAL/cfg-arduino_mini/mcuconf.h
+++ b/testhal/AVR/multi/PAL/cfg/arduino_mini/mcuconf.h
diff --git a/testhal/AVR/multi/PAL/cfg-arduino_mini/portab.c b/testhal/AVR/multi/PAL/cfg/arduino_mini/portab.c
index 6315515a0..6315515a0 100644
--- a/testhal/AVR/multi/PAL/cfg-arduino_mini/portab.c
+++ b/testhal/AVR/multi/PAL/cfg/arduino_mini/portab.c
diff --git a/testhal/AVR/multi/PAL/cfg-arduino_mini/portab.h b/testhal/AVR/multi/PAL/cfg/arduino_mini/portab.h
index 53b286dc8..53b286dc8 100644
--- a/testhal/AVR/multi/PAL/cfg-arduino_mini/portab.h
+++ b/testhal/AVR/multi/PAL/cfg/arduino_mini/portab.h
diff --git a/testhal/AVR/multi/PAL/cfg-arduino_nano/chconf.h b/testhal/AVR/multi/PAL/cfg/arduino_nano/chconf.h
index 4ecd81a8e..4ecd81a8e 100644
--- a/testhal/AVR/multi/PAL/cfg-arduino_nano/chconf.h
+++ b/testhal/AVR/multi/PAL/cfg/arduino_nano/chconf.h
diff --git a/testhal/AVR/multi/PAL/cfg-arduino_nano/halconf.h b/testhal/AVR/multi/PAL/cfg/arduino_nano/halconf.h
index 8d1b79823..8d1b79823 100644
--- a/testhal/AVR/multi/PAL/cfg-arduino_nano/halconf.h
+++ b/testhal/AVR/multi/PAL/cfg/arduino_nano/halconf.h
diff --git a/testhal/AVR/multi/PAL/cfg-arduino_nano/mcuconf.h b/testhal/AVR/multi/PAL/cfg/arduino_nano/mcuconf.h
index 9088ee992..9088ee992 100644
--- a/testhal/AVR/multi/PAL/cfg-arduino_nano/mcuconf.h
+++ b/testhal/AVR/multi/PAL/cfg/arduino_nano/mcuconf.h
diff --git a/testhal/AVR/multi/PAL/cfg-arduino_nano/portab.c b/testhal/AVR/multi/PAL/cfg/arduino_nano/portab.c
index 6315515a0..6315515a0 100644
--- a/testhal/AVR/multi/PAL/cfg-arduino_nano/portab.c
+++ b/testhal/AVR/multi/PAL/cfg/arduino_nano/portab.c
diff --git a/testhal/AVR/multi/PAL/cfg-arduino_nano/portab.h b/testhal/AVR/multi/PAL/cfg/arduino_nano/portab.h
index 53b286dc8..53b286dc8 100644
--- a/testhal/AVR/multi/PAL/cfg-arduino_nano/portab.h
+++ b/testhal/AVR/multi/PAL/cfg/arduino_nano/portab.h
diff --git a/testhal/AVR/multi/PAL/cfg-arduino_uno/chconf.h b/testhal/AVR/multi/PAL/cfg/arduino_uno/chconf.h
index 4ecd81a8e..4ecd81a8e 100644
--- a/testhal/AVR/multi/PAL/cfg-arduino_uno/chconf.h
+++ b/testhal/AVR/multi/PAL/cfg/arduino_uno/chconf.h
diff --git a/testhal/AVR/multi/PAL/cfg-arduino_uno/halconf.h b/testhal/AVR/multi/PAL/cfg/arduino_uno/halconf.h
index 8d1b79823..8d1b79823 100644
--- a/testhal/AVR/multi/PAL/cfg-arduino_uno/halconf.h
+++ b/testhal/AVR/multi/PAL/cfg/arduino_uno/halconf.h
diff --git a/testhal/AVR/multi/PAL/cfg-arduino_uno/mcuconf.h b/testhal/AVR/multi/PAL/cfg/arduino_uno/mcuconf.h
index 11aa69f22..11aa69f22 100644
--- a/testhal/AVR/multi/PAL/cfg-arduino_uno/mcuconf.h
+++ b/testhal/AVR/multi/PAL/cfg/arduino_uno/mcuconf.h
diff --git a/testhal/AVR/multi/PAL/cfg-arduino_uno/portab.c b/testhal/AVR/multi/PAL/cfg/arduino_uno/portab.c
index 6315515a0..6315515a0 100644
--- a/testhal/AVR/multi/PAL/cfg-arduino_uno/portab.c
+++ b/testhal/AVR/multi/PAL/cfg/arduino_uno/portab.c
diff --git a/testhal/AVR/multi/PAL/cfg-arduino_uno/portab.h b/testhal/AVR/multi/PAL/cfg/arduino_uno/portab.h
index 53b286dc8..53b286dc8 100644
--- a/testhal/AVR/multi/PAL/cfg-arduino_uno/portab.h
+++ b/testhal/AVR/multi/PAL/cfg/arduino_uno/portab.h
diff --git a/testhal/AVR/multi/PAL/Makefile-arduino_mega b/testhal/AVR/multi/PAL/make/Makefile-arduino_mega.make
index a3fc012a7..2f20664be 100644
--- a/testhal/AVR/multi/PAL/Makefile-arduino_mega
+++ b/testhal/AVR/multi/PAL/make/Makefile-arduino_mega.make
@@ -69,35 +69,33 @@ PROJECT = ch
 

 # Imported source files and paths

 CHIBIOS = ../../../..

-CONFDIR  := ./cfg-arduino_mega

-BUILDDIR := ./build-arduino_mega

-DEPDIR   := ./.dep-arduino_mega

+CONFDIR  := ./cfg/arduino_mega

+BUILDDIR := ./build/arduino_mega

+DEPDIR   := ./.dep/arduino_mega

+

+# Licensing files.

+include $(CHIBIOS)/os/license/license.mk

 

 # HAL-OSAL files (optional).

 include $(CHIBIOS)/os/hal/hal.mk

 include $(CHIBIOS)/os/hal/boards/ARDUINO_MEGA/board.mk

 include $(CHIBIOS)/os/hal/ports/AVR/MEGA/ATMEGAxx/platform.mk

 include $(CHIBIOS)/os/hal/osal/rt/osal.mk

+

 # RTOS files (optional).

 include $(CHIBIOS)/os/rt/rt.mk

 include $(CHIBIOS)/os/common/ports/AVR/compilers/GCC/mk/port.mk

 

 # List C source files here. (C dependencies are automatically generated.)

-CSRC =  $(KERNSRC)                      \

-        $(PORTSRC)                      \

-        $(OSALSRC)                      \

-        $(HALSRC)                       \

-        $(PLATFORMSRC)                  \

-        $(BOARDSRC)                     \

-        $(CHIBIOS)/os/various/evtimer.c \

+CSRC =  $(ALLCSRC)          \

+       $(CONFDIR)/portab.c  \

         main.c

 

 # List C++ sources file here.

-CPPSRC =

+CPPSRC = $(ALLCPPSRC)

 

-INCDIR =  $(CHIBIOS)/os/license $(PORTINC) $(KERNINC) \

-          $(HALINC) $(OSALINC) $(PLATFORMINC)         \

-          $(BOARDINC) $(CHIBIOS)/os/various $(CONFDIR)

+# Header files here.

+INCDIR = $(ALLINC) $(CONFDIR)

 

 #

 # Project, sources and paths.

diff --git a/testhal/AVR/multi/PAL/Makefile-arduino_mini b/testhal/AVR/multi/PAL/make/Makefile-arduino_mini.make
index 9dd318b7d..8f6a339e5 100644
--- a/testhal/AVR/multi/PAL/Makefile-arduino_mini
+++ b/testhal/AVR/multi/PAL/make/Makefile-arduino_mini.make
@@ -69,35 +69,33 @@ PROJECT = ch
 

 # Imported source files and paths

 CHIBIOS = ../../../..

-CONFDIR  := ./cfg-arduino_mini

-BUILDDIR := ./build-arduino_mini

-DEPDIR   := ./.dep-arduino_mini

+CONFDIR  := ./cfg/arduino_mini

+BUILDDIR := ./build/arduino_mini

+DEPDIR   := ./.dep/arduino_mini

+

+# Licensing files.

+include $(CHIBIOS)/os/license/license.mk

 

 # HAL-OSAL files (optional).

 include $(CHIBIOS)/os/hal/hal.mk

 include $(CHIBIOS)/os/hal/boards/ARDUINO_MINI/board.mk

 include $(CHIBIOS)/os/hal/ports/AVR/MEGA/ATMEGAxx/platform.mk

 include $(CHIBIOS)/os/hal/osal/rt/osal.mk

+

 # RTOS files (optional).

 include $(CHIBIOS)/os/rt/rt.mk

 include $(CHIBIOS)/os/common/ports/AVR/compilers/GCC/mk/port.mk

 

 # List C source files here. (C dependencies are automatically generated.)

-CSRC =  $(KERNSRC)                      \

-        $(PORTSRC)                      \

-        $(OSALSRC)                      \

-        $(HALSRC)                       \

-        $(PLATFORMSRC)                  \

-        $(BOARDSRC)                     \

-        $(CHIBIOS)/os/various/evtimer.c \

+CSRC =  $(ALLCSRC)          \

+       $(CONFDIR)/portab.c  \

         main.c

 

 # List C++ sources file here.

-CPPSRC =

+CPPSRC = $(ALLCPPSRC)

 

-INCDIR =  $(CHIBIOS)/os/license $(PORTINC) $(KERNINC)   \

-          $(HALINC) $(OSALINC) $(PLATFORMINC)           \

-          $(BOARDINC) $(CHIBIOS)/os/various $(CONFDIR)

+# Header files here.

+INCDIR = $(ALLINC) $(CONFDIR)

 

 #

 # Project, sources and paths.

diff --git a/testhal/AVR/multi/PAL/Makefile-arduino_nano b/testhal/AVR/multi/PAL/make/Makefile-arduino_nano.make
index 018b56918..8dd7079fd 100644
--- a/testhal/AVR/multi/PAL/Makefile-arduino_nano
+++ b/testhal/AVR/multi/PAL/make/Makefile-arduino_nano.make
@@ -69,9 +69,12 @@ PROJECT = ch
 

 # Imported source files and paths

 CHIBIOS = ../../../..

-CONFDIR  := ./cfg-arduino_nano

-BUILDDIR := ./build-arduino_nano

-DEPDIR   := ./.dep-arduino_nano

+CONFDIR  := ./cfg/arduino_nano

+BUILDDIR := ./build/arduino_nano

+DEPDIR   := ./.dep/arduino_nano

+

+# Licensing files.

+include $(CHIBIOS)/os/license/license.mk

 

 # HAL-OSAL files (optional).

 include $(CHIBIOS)/os/hal/hal.mk

@@ -83,21 +86,15 @@ include $(CHIBIOS)/os/rt/rt.mk
 include $(CHIBIOS)/os/common/ports/AVR/compilers/GCC/mk/port.mk

 

 # List C source files here. (C dependencies are automatically generated.)

-CSRC =  $(KERNSRC)                      \

-        $(PORTSRC)                      \

-        $(OSALSRC)                      \

-        $(HALSRC)                       \

-        $(PLATFORMSRC)                  \

-        $(BOARDSRC)                     \

-        $(CHIBIOS)/os/various/evtimer.c \

+CSRC =  $(ALLCSRC)          \

+       $(CONFDIR)/portab.c  \

         main.c

 

 # List C++ sources file here.

-CPPSRC =

+CPPSRC = $(ALLCPPSRC)

 

-INCDIR =  $(CHIBIOS)/os/license $(PORTINC) $(KERNINC)  \

-          $(HALINC) $(OSALINC) $(PLATFORMINC)          \

-          $(BOARDINC) $(CHIBIOS)/os/various $(CONFDIR)

+# Header files here.

+INCDIR = $(ALLINC) $(CONFDIR)

 

 #

 # Project, sources and paths.

diff --git a/testhal/AVR/multi/PAL/Makefile-arduino_uno b/testhal/AVR/multi/PAL/make/Makefile-arduino_uno.make
index 2bc81e756..3a8faae93 100644
--- a/testhal/AVR/multi/PAL/Makefile-arduino_uno
+++ b/testhal/AVR/multi/PAL/make/Makefile-arduino_uno.make
@@ -69,35 +69,33 @@ PROJECT = ch
 

 # Imported source files and paths

 CHIBIOS = ../../../..

-CONFDIR  := ./cfg-arduino_uno

-BUILDDIR := ./build-arduino_uno

-DEPDIR   := ./.dep-arduino_uno

+CONFDIR  := ./cfg/arduino_uno

+BUILDDIR := ./build/arduino_uno

+DEPDIR   := ./.dep/arduino_uno

+

+# Licensing files.

+include $(CHIBIOS)/os/license/license.mk

 

 # HAL-OSAL files (optional).

 include $(CHIBIOS)/os/hal/hal.mk

 include $(CHIBIOS)/os/hal/boards/ARDUINO_UNO/board.mk

 include $(CHIBIOS)/os/hal/ports/AVR/MEGA/ATMEGAxx/platform.mk

 include $(CHIBIOS)/os/hal/osal/rt/osal.mk

+

 # RTOS files (optional).

 include $(CHIBIOS)/os/rt/rt.mk

 include $(CHIBIOS)/os/common/ports/AVR/compilers/GCC/mk/port.mk

 

 # List C source files here. (C dependencies are automatically generated.)

-CSRC =  $(KERNSRC)                      \

-        $(PORTSRC)                      \

-        $(OSALSRC)                      \

-        $(HALSRC)                       \

-        $(PLATFORMSRC)                  \

-        $(BOARDSRC)                     \

-        $(CHIBIOS)/os/various/evtimer.c \

+CSRC =  $(ALLCSRC)          \

+       $(CONFDIR)/portab.c  \

         main.c

 

 # List C++ sources file here.

-CPPSRC =

+CPPSRC = $(ALLCPPSRC)

 

-INCDIR =  $(CHIBIOS)/os/license $(PORTINC) $(KERNINC)  \

-          $(HALINC) $(OSALINC) $(PLATFORMINC)          \

-          $(BOARDINC) $(CHIBIOS)/os/various $(CONFDIR)

+# Header files here.

+INCDIR = $(ALLINC) $(CONFDIR)

 

 #

 # Project, sources and paths.