From c1abc1e06fb61c5b6c9bd6e89815570fde0fdec8 Mon Sep 17 00:00:00 2001 From: Theodore Ateba Date: Fri, 14 Jul 2017 00:39:53 +0000 Subject: Update AVR demos Makefiles according the new structure. git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@10327 35acf78f-673a-0410-8e92-d51de3d6d3f4 --- demos/AVR/NIL-ARDUINO-MEGA/Makefile | 16 ++++++++-------- demos/AVR/NIL-ARDUINO-UNO/Makefile | 16 ++++++++-------- demos/AVR/RT-ARDUINO-LEONARDO/Makefile | 16 ++++++++-------- demos/AVR/RT-ARDUINO-MEGA/Makefile | 18 +++++++++--------- demos/AVR/RT-ARDUINO-MINI/Makefile | 16 ++++++++-------- demos/AVR/RT-ARDUINO-NANO/Makefile | 14 +++++++------- demos/AVR/RT-ARDUINO-UNO/Makefile | 16 ++++++++-------- demos/AVR/RT-PRO-MICRO/Makefile | 19 ++++++++++--------- demos/AVR/RT-TEENSY2-USB/Makefile | 20 ++++++++++---------- 9 files changed, 76 insertions(+), 75 deletions(-) diff --git a/demos/AVR/NIL-ARDUINO-MEGA/Makefile b/demos/AVR/NIL-ARDUINO-MEGA/Makefile index 7e8fb2203..161ecd928 100644 --- a/demos/AVR/NIL-ARDUINO-MEGA/Makefile +++ b/demos/AVR/NIL-ARDUINO-MEGA/Makefile @@ -60,20 +60,20 @@ OBJDIR = . CHIBIOS = ../../.. include $(CHIBIOS)/os/hal/hal.mk include $(CHIBIOS)/os/hal/boards/ARDUINO_MEGA/board.mk -include $(CHIBIOS)/os/hal/ports/AVR/platform.mk +include $(CHIBIOS)/os/hal/ports/AVR/MEGA/platform.mk include $(CHIBIOS)/os/hal/osal/nil/osal.mk include $(CHIBIOS)/os/nil/nil.mk include $(CHIBIOS)/os/common/ports/AVR/compilers/GCC/mk/port.mk include $(CHIBIOS)/test/nil/test.mk # List C source files here. (C dependencies are automatically generated.) -SRC = $(KERNSRC) \ - $(PORTSRC) \ - $(OSALSRC) \ - $(HALSRC) \ - $(PLATFORMSRC) \ - $(BOARDSRC) \ - $(TESTSRC) \ +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/NIL-ARDUINO-UNO/Makefile b/demos/AVR/NIL-ARDUINO-UNO/Makefile index da1597487..43180c1ff 100644 --- a/demos/AVR/NIL-ARDUINO-UNO/Makefile +++ b/demos/AVR/NIL-ARDUINO-UNO/Makefile @@ -60,20 +60,20 @@ OBJDIR = . CHIBIOS = ../../.. include $(CHIBIOS)/os/hal/hal.mk include $(CHIBIOS)/os/hal/boards/ARDUINO_UNO/board.mk -include $(CHIBIOS)/os/hal/ports/AVR/platform.mk +include $(CHIBIOS)/os/hal/ports/AVR/MEGA/platform.mk include $(CHIBIOS)/os/hal/osal/nil/osal.mk include $(CHIBIOS)/os/nil/nil.mk include $(CHIBIOS)/os/common/ports/AVR/compilers/GCC/mk/port.mk include $(CHIBIOS)/test/nil/test.mk # List C source files here. (C dependencies are automatically generated.) -SRC = $(KERNSRC) \ - $(PORTSRC) \ - $(OSALSRC) \ - $(HALSRC) \ - $(PLATFORMSRC) \ - $(BOARDSRC) \ - $(TESTSRC) \ +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-ARDUINO-LEONARDO/Makefile b/demos/AVR/RT-ARDUINO-LEONARDO/Makefile index e23747b0a..506592974 100644 --- a/demos/AVR/RT-ARDUINO-LEONARDO/Makefile +++ b/demos/AVR/RT-ARDUINO-LEONARDO/Makefile @@ -60,19 +60,19 @@ OBJDIR = . CHIBIOS = ../../.. include $(CHIBIOS)/os/hal/hal.mk include $(CHIBIOS)/os/hal/boards/ARDUINO_LEONARDO/board.mk -include $(CHIBIOS)/os/hal/ports/AVR/platform.mk +include $(CHIBIOS)/os/hal/ports/AVR/MEGA/platform.mk include $(CHIBIOS)/os/hal/osal/rt/osal.mk 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.) -SRC = $(KERNSRC) \ - $(PORTSRC) \ - $(OSALSRC) \ - $(HALSRC) \ - $(PLATFORMSRC) \ - $(BOARDSRC) \ - $(TESTSRC) \ +SRC = $(KERNSRC) \ + $(PORTSRC) \ + $(OSALSRC) \ + $(HALSRC) \ + $(PLATFORMSRC) \ + $(BOARDSRC) \ + $(TESTSRC) \ $(CHIBIOS)/os/various/evtimer.c \ usbcfg.c main.c diff --git a/demos/AVR/RT-ARDUINO-MEGA/Makefile b/demos/AVR/RT-ARDUINO-MEGA/Makefile index 8e918ccdd..72a042845 100644 --- a/demos/AVR/RT-ARDUINO-MEGA/Makefile +++ b/demos/AVR/RT-ARDUINO-MEGA/Makefile @@ -40,7 +40,7 @@ #---------------------------------------------------------------------------- # MCU name -MCU = atmega1280 +MCU = atmega2560 # Processor frequency. F_CPU = 16000000 @@ -60,20 +60,20 @@ OBJDIR = . CHIBIOS = ../../.. include $(CHIBIOS)/os/hal/hal.mk include $(CHIBIOS)/os/hal/boards/ARDUINO_MEGA/board.mk -include $(CHIBIOS)/os/hal/ports/AVR/platform.mk +include $(CHIBIOS)/os/hal/ports/AVR/MEGA/platform.mk include $(CHIBIOS)/os/hal/osal/rt/osal.mk include $(CHIBIOS)/os/rt/rt.mk include $(CHIBIOS)/os/common/ports/AVR/compilers/GCC/mk/port.mk include $(CHIBIOS)/test/rt/test.mk # List C source files here. (C dependencies are automatically generated.) -SRC = $(KERNSRC) \ - $(PORTSRC) \ - $(OSALSRC) \ - $(HALSRC) \ - $(PLATFORMSRC) \ - $(BOARDSRC) \ - $(TESTSRC) \ +SRC = $(KERNSRC) \ + $(PORTSRC) \ + $(OSALSRC) \ + $(HALSRC) \ + $(PLATFORMSRC) \ + $(BOARDSRC) \ + $(TESTSRC) \ $(CHIBIOS)/os/various/evtimer.c \ main.c diff --git a/demos/AVR/RT-ARDUINO-MINI/Makefile b/demos/AVR/RT-ARDUINO-MINI/Makefile index 62cdad88c..0b63fe11c 100644 --- a/demos/AVR/RT-ARDUINO-MINI/Makefile +++ b/demos/AVR/RT-ARDUINO-MINI/Makefile @@ -60,20 +60,20 @@ OBJDIR = . CHIBIOS = ../../.. include $(CHIBIOS)/os/hal/hal.mk include $(CHIBIOS)/os/hal/boards/ARDUINO_MINI/board.mk -include $(CHIBIOS)/os/hal/ports/AVR/platform.mk +include $(CHIBIOS)/os/hal/ports/AVR/MEGA/platform.mk include $(CHIBIOS)/os/hal/osal/rt/osal.mk include $(CHIBIOS)/os/rt/rt.mk include $(CHIBIOS)/os/common/ports/AVR/compilers/GCC/mk/port.mk #include $(CHIBIOS)/test/rt/test.mk # List C source files here. (C dependencies are automatically generated.) -SRC = $(KERNSRC) \ - $(PORTSRC) \ - $(OSALSRC) \ - $(HALSRC) \ - $(PLATFORMSRC) \ - $(BOARDSRC) \ - $(CHIBIOS)/os/various/evtimer.c \ +SRC = $(KERNSRC) \ + $(PORTSRC) \ + $(OSALSRC) \ + $(HALSRC) \ + $(PLATFORMSRC) \ + $(BOARDSRC) \ + $(CHIBIOS)/os/various/evtimer.c \ main.c # List C++ source files here. (C dependencies are automatically generated.) diff --git a/demos/AVR/RT-ARDUINO-NANO/Makefile b/demos/AVR/RT-ARDUINO-NANO/Makefile index 1207c2ca6..471bcafda 100644 --- a/demos/AVR/RT-ARDUINO-NANO/Makefile +++ b/demos/AVR/RT-ARDUINO-NANO/Makefile @@ -60,19 +60,19 @@ OBJDIR = . CHIBIOS = ../../.. include $(CHIBIOS)/os/hal/hal.mk include $(CHIBIOS)/os/hal/boards/ARDUINO_NANO/board.mk -include $(CHIBIOS)/os/hal/ports/AVR/platform.mk +include $(CHIBIOS)/os/hal/ports/AVR/MEGA/platform.mk include $(CHIBIOS)/os/hal/osal/rt/osal.mk include $(CHIBIOS)/os/rt/rt.mk include $(CHIBIOS)/os/common/ports/AVR/compilers/GCC/mk/port.mk #include $(CHIBIOS)/test/rt/test.mk # List C source files here. (C dependencies are automatically generated.) -SRC = $(KERNSRC) \ - $(PORTSRC) \ - $(OSALSRC) \ - $(HALSRC) \ - $(PLATFORMSRC) \ - $(BOARDSRC) \ +SRC = $(KERNSRC) \ + $(PORTSRC) \ + $(OSALSRC) \ + $(HALSRC) \ + $(PLATFORMSRC) \ + $(BOARDSRC) \ $(CHIBIOS)/os/various/evtimer.c \ main.c diff --git a/demos/AVR/RT-ARDUINO-UNO/Makefile b/demos/AVR/RT-ARDUINO-UNO/Makefile index e3f4560ee..48991f9f1 100644 --- a/demos/AVR/RT-ARDUINO-UNO/Makefile +++ b/demos/AVR/RT-ARDUINO-UNO/Makefile @@ -60,20 +60,20 @@ OBJDIR = . CHIBIOS = ../../.. include $(CHIBIOS)/os/hal/hal.mk include $(CHIBIOS)/os/hal/boards/ARDUINO_UNO/board.mk -include $(CHIBIOS)/os/hal/ports/AVR/platform.mk +include $(CHIBIOS)/os/hal/ports/AVR/MEGA/platform.mk include $(CHIBIOS)/os/hal/osal/rt/osal.mk include $(CHIBIOS)/os/rt/rt.mk include $(CHIBIOS)/os/common/ports/AVR/compilers/GCC/mk/port.mk #include $(CHIBIOS)/test/rt/test.mk # List C source files here. (C dependencies are automatically generated.) -SRC = $(KERNSRC) \ - $(PORTSRC) \ - $(OSALSRC) \ - $(HALSRC) \ - $(PLATFORMSRC) \ - $(BOARDSRC) \ - $(CHIBIOS)/os/various/evtimer.c \ +SRC = $(KERNSRC) \ + $(PORTSRC) \ + $(OSALSRC) \ + $(HALSRC) \ + $(PLATFORMSRC) \ + $(BOARDSRC) \ + $(CHIBIOS)/os/various/evtimer.c \ main.c # List C++ source files here. (C dependencies are automatically generated.) diff --git a/demos/AVR/RT-PRO-MICRO/Makefile b/demos/AVR/RT-PRO-MICRO/Makefile index 5c929d31a..e162b0b90 100644 --- a/demos/AVR/RT-PRO-MICRO/Makefile +++ b/demos/AVR/RT-PRO-MICRO/Makefile @@ -60,21 +60,22 @@ OBJDIR = . CHIBIOS = ../../.. include $(CHIBIOS)/os/hal/hal.mk include $(CHIBIOS)/os/hal/boards/SPARKFUN_PRO_MICRO/board.mk -include $(CHIBIOS)/os/hal/ports/AVR/platform.mk +include $(CHIBIOS)/os/hal/ports/AVR/MEGA/platform.mk include $(CHIBIOS)/os/hal/osal/rt/osal.mk 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.) -SRC = $(KERNSRC) \ - $(PORTSRC) \ - $(OSALSRC) \ - $(HALSRC) \ - $(PLATFORMSRC) \ - $(BOARDSRC) \ - $(TESTSRC) \ +SRC = $(KERNSRC) \ + $(PORTSRC) \ + $(OSALSRC) \ + $(HALSRC) \ + $(PLATFORMSRC) \ + $(BOARDSRC) \ + $(TESTSRC) \ $(CHIBIOS)/os/various/evtimer.c \ - usbcfg.c main.c + usbcfg.c \ + main.c # List C++ source files here. (C dependencies are automatically generated.) CPPSRC = diff --git a/demos/AVR/RT-TEENSY2-USB/Makefile b/demos/AVR/RT-TEENSY2-USB/Makefile index 32c4e4b76..6f540b11c 100644 --- a/demos/AVR/RT-TEENSY2-USB/Makefile +++ b/demos/AVR/RT-TEENSY2-USB/Makefile @@ -60,7 +60,7 @@ OBJDIR = . CHIBIOS = ../../.. include $(CHIBIOS)/os/hal/hal.mk include $(CHIBIOS)/os/hal/boards/PJRC_TEENSY_2PLUSPLUS/board.mk -include $(CHIBIOS)/os/hal/ports/AVR/platform.mk +include $(CHIBIOS)/os/hal/ports/AVR/MEGA/platform.mk include $(CHIBIOS)/os/hal/osal/rt/osal.mk include $(CHIBIOS)/os/rt/rt.mk include $(CHIBIOS)/os/common/ports/AVR/compilers/GCC/mk/port.mk @@ -68,15 +68,15 @@ include $(CHIBIOS)/os/hal/lib/streams/streams.mk include $(CHIBIOS)/os/various/shell/shell.mk # List C source files here. (C dependencies are automatically generated.) -SRC = $(KERNSRC) \ - $(PORTSRC) \ - $(OSALSRC) \ - $(HALSRC) \ - $(PLATFORMSRC) \ - $(BOARDSRC) \ - $(STREAMSSRC) \ - $(SHELLSRC) \ - usbcfg.c \ +SRC = $(KERNSRC) \ + $(PORTSRC) \ + $(OSALSRC) \ + $(HALSRC) \ + $(PLATFORMSRC) \ + $(BOARDSRC) \ + $(STREAMSSRC) \ + $(SHELLSRC) \ + usbcfg.c \ main.c # List C++ source files here. (C dependencies are automatically generated.) -- cgit v1.2.3