Align AVR demo Makefiles.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@15018 27425a3e-05d8-49a3-a47f-9c15f0e5edd8
2021-11-06 17:36:18 +00:00 · 2021-11-06 17:36:18 +00:00 · 0e5d2023d4
parent d7184b008a
commit 0e5d2023d4
18 changed files with 181 additions and 197 deletions
--- a/demos/AVR/NIL-ARDUINO-MEGA/Makefile
+++ b/demos/AVR/NIL-ARDUINO-MEGA/Makefile
@ -82,7 +82,7 @@ endif
 # Define project name here.
 PROJECT = ch

-# Imported source files and paths
+# Imported source files and paths.
 CHIBIOS  := ../../..
 CONFDIR  := ./cfg
 BUILDDIR := ./build
@ -145,9 +145,6 @@ SZ  = $(TRGT)size
 HEX   = $(CP) -O ihex
 BIN   = $(CP) -O binary

-# AVR programming tool.
-AVRDUDE = avrdude
-
 # Size of the elf binary file.
 ELFSIZE = $(SZ) --mcu=$(MCU) --format=avr $(BUILDDIR)/$(PROJECT).elf

@ -169,7 +166,7 @@ CPPWARN =
 #

 # List all user C define here, like -D_DEBUG=1.
-UDEFS =
+UDEFS = -DTEST_CFG_SIZE_REPORT=0

 # Define ASM defines here.
 UADEFS =
--- a/demos/AVR/NIL-ARDUINO-MINI/Makefile
+++ b/demos/AVR/NIL-ARDUINO-MINI/Makefile
@ -82,7 +82,7 @@ endif
 # Define project name here.
 PROJECT = ch

-# Imported source files and paths
+# Imported source files and paths.
 CHIBIOS  := ../../..
 CONFDIR  := ./cfg
 BUILDDIR := ./build
@ -145,9 +145,6 @@ SZ    = $(TRGT)size
 HEX   = $(CP) -O ihex
 BIN   = $(CP) -O binary

-# AVR programming tool.
-AVRDUDE = avrdude
-
 # Size of the elf binary file.
 ELFSIZE = $(SZ) --mcu=$(MCU) --format=avr $(BUILDDIR)/$(PROJECT).elf

@ -169,7 +166,7 @@ CPPWARN =
 #

 # List all user C define here, like -D_DEBUG=1.
-UDEFS =
+UDEFS = -DTEST_CFG_SIZE_REPORT=0

 # Define ASM defines here.
 UADEFS =
--- a/demos/AVR/NIL-ARDUINO-NANO/Makefile
+++ b/demos/AVR/NIL-ARDUINO-NANO/Makefile
@ -82,7 +82,7 @@ endif
 # Define project name here.
 PROJECT = ch

-# Imported source files and paths
+# Imported source files and paths.
 CHIBIOS  := ../../..
 CONFDIR  := ./cfg
 BUILDDIR := ./build
@ -145,9 +145,6 @@ SZ    = $(TRGT)size
 HEX   = $(CP) -O ihex
 BIN   = $(CP) -O binary

-# AVR programming tool.
-AVRDUDE = avrdude
-
 # Size of the elf binary file.
 ELFSIZE = $(SZ) --mcu=$(MCU) --format=avr $(BUILDDIR)/$(PROJECT).elf

@ -169,7 +166,7 @@ CPPWARN =
 #

 # List all user C define here, like -D_DEBUG=1.
-UDEFS =
+UDEFS = -DTEST_CFG_SIZE_REPORT=0

 # Define ASM defines here.
 UADEFS =
--- a/demos/AVR/NIL-ARDUINO-UNO/Makefile
+++ b/demos/AVR/NIL-ARDUINO-UNO/Makefile
@ -82,7 +82,7 @@ endif
 # Define project name here.
 PROJECT = ch

-# Imported source files and paths
+# Imported source files and paths.
 CHIBIOS  := ../../..
 CONFDIR  := ./cfg
 BUILDDIR := ./build
@ -145,9 +145,6 @@ SZ    = $(TRGT)size
 HEX   = $(CP) -O ihex
 BIN   = $(CP) -O binary

-# AVR programming tool.
-AVRDUDE = avrdude
-
 # Size of the elf binary file.
 ELFSIZE = $(SZ) --mcu=$(MCU) --format=avr $(BUILDDIR)/$(PROJECT).elf

@ -169,7 +166,7 @@ CPPWARN =
 #

 # List all user C define here, like -D_DEBUG=1.
-UDEFS =
+UDEFS = -DTEST_CFG_SIZE_REPORT=0

 # Define ASM defines here.
 UADEFS =
--- a/demos/AVR/NIL-DIGISPARK-ATTINY-167/Makefile
+++ b/demos/AVR/NIL-DIGISPARK-ATTINY-167/Makefile
@ -82,7 +82,7 @@ endif
 # Define project name here.
 PROJECT = ch

-# Imported source files and paths
+# Imported source files and paths.
 CHIBIOS  := ../../..
 CONFDIR  := ./cfg
 BUILDDIR := ./build
@ -166,7 +166,7 @@ CPPWARN =
 #

 # List all user C define here, like -D_DEBUG=1.
-UDEFS =
+UDEFS = -DTEST_CFG_SIZE_REPORT=0

 # Define ASM defines here.
 UADEFS =
--- a/demos/AVR/NIL-MT-DB-X4/Makefile
+++ b/demos/AVR/NIL-MT-DB-X4/Makefile
@ -82,7 +82,7 @@ endif
 # Define project name here.
 PROJECT = ch

-# Imported source files and paths
+# Imported source files and paths.
 CHIBIOS  := ../../..
 CONFDIR  := ./cfg
 BUILDDIR := ./build
@ -166,7 +166,7 @@ CPPWARN =
 #

 # List all user C define here, like -D_DEBUG=1.
-UDEFS =
+UDEFS = -DTEST_CFG_SIZE_REPORT=0

 # Define ASM defines here.
 UADEFS =
--- a/demos/AVR/RT-ARDUINO-LEONARDO/Makefile
+++ b/demos/AVR/RT-ARDUINO-LEONARDO/Makefile
@ -56,7 +56,6 @@ ifeq ($(USE_VERBOSE_PROGRAMMATION),)
  USE_VERBOSE_PROGRAMMATION = no
 endif

-
 # Enable this if you want to use AVRDUDE programmer.
 ifeq ($(USE_AVRDUDE_PROGRAMMER),)
  USE_AVRDUDE_PROGRAMMER = yes
@ -71,6 +70,7 @@ endif
 ifeq ($(USE_MICRONUCLEUS_PROGRAMMER),)
  USE_MICRONUCLEUS_PROGRAMMER = no
 endif
+
 #
 # Building and programming global options.
 ##############################################################################
@ -82,7 +82,7 @@ endif
 # Define project name here.
 PROJECT = ch

-# Imported source files and paths
+# Imported source files and paths.
 CHIBIOS  := ../../..
 CONFDIR  := ./cfg
 BUILDDIR := ./build
@ -167,7 +167,7 @@ CPPWARN =
 #

 # List all user C define here, like -D_DEBUG=1.
-UDEFS =
+UDEFS = -DTEST_CFG_SIZE_REPORT=0

 # Define ASM defines here.
 UADEFS =
@ -279,7 +279,7 @@ ifeq ($(AVR_PROGRAMMER),$(AVRDUDE_PROGRAMMER))
 program: $(BUILDDIR)/$(PROJECT).hex
 	@echo
 	@echo Programming $(MCU) device.
-	$(AVR_PROGRAMMER) $(AVRDUDE_FLAGS) $(AVRDUDE_WRITE_FLASH)
+	$(AVR_PROGRAMMER) $(AVRDUDE_FLAGS) $(AVRDUDE_WRITE_FLASH) $<
 	@echo Done.
 endif

--- a/demos/AVR/RT-ARDUINO-MEGA/Makefile
+++ b/demos/AVR/RT-ARDUINO-MEGA/Makefile
@ -82,7 +82,7 @@ endif
 # Define project name here.
 PROJECT = ch

-# Imported source files and paths
+# Imported source files and paths.
 CHIBIOS  := ../../..
 CONFDIR  := ./cfg
 BUILDDIR := ./build
@ -166,7 +166,7 @@ CPPWARN =
 #

 # List all user C define here, like -D_DEBUG=1.
-UDEFS =
+UDEFS = -DTEST_CFG_SIZE_REPORT=0

 # Define ASM defines here.
 UADEFS =
--- a/demos/AVR/RT-ARDUINO-MINI/Makefile
+++ b/demos/AVR/RT-ARDUINO-MINI/Makefile
@ -56,7 +56,6 @@ ifeq ($(USE_VERBOSE_PROGRAMMATION),)
  USE_VERBOSE_PROGRAMMATION = no
 endif

-
 # Enable this if you want to use AVRDUDE programmer.
 ifeq ($(USE_AVRDUDE_PROGRAMMER),)
  USE_AVRDUDE_PROGRAMMER = yes
@ -83,7 +82,7 @@ endif
 # Define project name here.
 PROJECT = ch

-# Imported source files and paths
+# Imported source files and paths.
 CHIBIOS  := ../../..
 CONFDIR  := ./cfg
 BUILDDIR := ./build
@ -167,7 +166,7 @@ CPPWARN =
 #

 # List all user C define here, like -D_DEBUG=1.
-UDEFS =
+UDEFS = -DTEST_CFG_SIZE_REPORT=0

 # Define ASM defines here.
 UADEFS =
--- a/demos/AVR/RT-ARDUINO-NANO/Makefile
+++ b/demos/AVR/RT-ARDUINO-NANO/Makefile
@ -56,7 +56,6 @@ ifeq ($(USE_VERBOSE_PROGRAMMATION),)
  USE_VERBOSE_PROGRAMMATION = no
 endif

-
 # Enable this if you want to use AVRDUDE programmer.
 ifeq ($(USE_AVRDUDE_PROGRAMMER),)
  USE_AVRDUDE_PROGRAMMER = yes
@ -83,7 +82,7 @@ endif
 # Define project name here.
 PROJECT = ch

-# Imported source files and paths
+# Imported source files and paths.
 CHIBIOS  := ../../..
 CONFDIR  := ./cfg
 BUILDDIR := ./build
@ -167,7 +166,7 @@ CPPWARN =
 #

 # List all user C define here, like -D_DEBUG=1.
-UDEFS =
+UDEFS = -DTEST_CFG_SIZE_REPORT=0

 # Define ASM defines here.
 UADEFS =
--- a/demos/AVR/RT-ARDUINO-UNO/Makefile
+++ b/demos/AVR/RT-ARDUINO-UNO/Makefile
@ -35,7 +35,7 @@ ifeq ($(USE_VERBOSE_COMPILE),)
  USE_VERBOSE_COMPILE = no
 endif

-# If enabled, this option makes the build process faster by not compiling.
+# If enabled, this option makes the build process faster by not compiling
 # modules not used in the current configuration.
 ifeq ($(USE_SMART_BUILD),)
  USE_SMART_BUILD = yes
@ -166,7 +166,7 @@ CPPWARN =
 #

 # List all user C define here, like -D_DEBUG=1.
-UDEFS =
+UDEFS = -DTEST_CFG_SIZE_REPORT=0

 # Define ASM defines here.
 UADEFS =
--- a/demos/AVR/RT-DIGISPARK-ATTINY-167/Makefile
+++ b/demos/AVR/RT-DIGISPARK-ATTINY-167/Makefile
@ -82,7 +82,7 @@ endif
 # Define project name here.
 PROJECT = ch

-# Imported source files and paths
+# Imported source files and paths.
 CHIBIOS  := ../../..
 CONFDIR  := ./cfg
 BUILDDIR := ./build
@ -166,7 +166,7 @@ CPPWARN =
 #

 # List all user C define here, like -D_DEBUG=1.
-UDEFS =
+UDEFS = -DTEST_CFG_SIZE_REPORT=0

 # Define ASM defines here.
 UADEFS =
--- a/demos/AVR/RT-MT-DB-X4/Makefile
+++ b/demos/AVR/RT-MT-DB-X4/Makefile
@ -82,7 +82,7 @@ endif
 # Define project name here.
 PROJECT = ch

-# Imported source files and paths
+# Imported source files and paths.
 CHIBIOS  := ../../..
 CONFDIR  := ./cfg
 BUILDDIR := ./build
@ -166,7 +166,7 @@ CPPWARN =
 #

 # List all user C define here, like -D_DEBUG=1.
-UDEFS =
+UDEFS = -DTEST_CFG_SIZE_REPORT=0

 # Define ASM defines here.
 UADEFS =
--- a/demos/AVR/RT-PRO-MICRO/Makefile
+++ b/demos/AVR/RT-PRO-MICRO/Makefile
@ -82,7 +82,7 @@ endif
 # Define project name here.
 PROJECT = ch

-# Imported source files and paths
+# Imported source files and paths.
 CHIBIOS  := ../../..
 CONFDIR  := ./cfg
 BUILDDIR := ./build
@ -167,7 +167,7 @@ CPPWARN =
 #

 # List all user C define here, like -D_DEBUG=1.
-UDEFS =
+UDEFS = -DTEST_CFG_SIZE_REPORT=0

 # Define ASM defines here.
 UADEFS =
--- a/demos/AVR/RT-TEENSY2-USB/Makefile
+++ b/demos/AVR/RT-TEENSY2-USB/Makefile
@ -82,7 +82,7 @@ endif
 # Define project name here.
 PROJECT = ch

-# Imported source files and paths
+# Imported source files and paths.
 CHIBIOS  := ../../..
 CONFDIR  := ./cfg
 BUILDDIR := ./build
--- a/demos/AVR/TEST-SUITE-NIL/Makefile
+++ b/demos/AVR/TEST-SUITE-NIL/Makefile
@ -82,11 +82,11 @@ endif
 # Define project name here.
 PROJECT = ch

-# Imported source files and paths
-CHIBIOS = ../../..
+# Imported source files and paths.
 CHIBIOS  := ../../..
 CONFDIR  := ./cfg
 BUILDDIR := ./build
+DEPDIR   := ./.dep

 # Licensing files.
 include $(CHIBIOS)/os/license/license.mk
@ -113,6 +113,7 @@ CSRC =  $(ALLCSRC) \
 # List C++ sources file here.
 CPPSRC = $(ALLCPPSRC)

+# Header files here.
 INCDIR = $(CONFDIR) $(ALLINC) $(TESTINC)

 #
@ -149,9 +150,6 @@ SZ  = $(TRGT)size
 HEX   = $(CP) -O ihex
 BIN   = $(CP) -O binary

-# AVR programming tool.
-AVRDUDE = avrdude
-
 # Size of the elf binary file.
 ELFSIZE = $(SZ) --mcu=$(MCU) --format=avr $(BUILDDIR)/$(PROJECT).elf

--- a/demos/AVR/TEST-SUITE-OSLIB/Makefile
+++ b/demos/AVR/TEST-SUITE-OSLIB/Makefile
@ -82,8 +82,7 @@ endif
 # Define project name here.
 PROJECT = ch

-# Imported source files and paths
-CHIBIOS = ../../..
+# Imported source files and paths.
 CHIBIOS  := ../../..
 CONFDIR  := ./cfg
 BUILDDIR := ./build
@ -114,6 +113,7 @@ CSRC =  $(ALLCSRC) \
 # List C++ sources file here.
 CPPSRC = $(ALLCPPSRC)

+# Header files here.
 INCDIR = $(CONFDIR) $(ALLINC) $(TESTINC)

 #
--- a/demos/AVR/TEST-SUITE-RT/Makefile
+++ b/demos/AVR/TEST-SUITE-RT/Makefile
@ -82,8 +82,7 @@ endif
 # Define project name here.
 PROJECT = ch

-# Imported source files and paths
-CHIBIOS = ../../..
+# Imported source files and paths.
 CHIBIOS  := ../../..
 CONFDIR  := ./cfg
 BUILDDIR := ./build
@ -114,6 +113,7 @@ CSRC =  $(ALLCSRC) \
 # List C++ sources file here.
 CPPSRC = $(ALLCPPSRC)

+# Header files here.
 INCDIR = $(CONFDIR) $(ALLINC) $(TESTINC)

 #