diff options
Diffstat (limited to 'arduino-mk')
| -rw-r--r-- | arduino-mk/Arduino.mk | 652 |
1 files changed, 477 insertions, 175 deletions
diff --git a/arduino-mk/Arduino.mk b/arduino-mk/Arduino.mk index 09819ac..96f2e1b 100644 --- a/arduino-mk/Arduino.mk +++ b/arduino-mk/Arduino.mk @@ -3,10 +3,13 @@ # Arduino command line tools Makefile # System part (i.e. project independent) # +# Copyright (C) 2012 Sudar <http://sudarmuthu.com>, based on +# - M J Oldfield work: https://github.com/mjoldfield/Arduino-Makefile +# # Copyright (C) 2010,2011,2012 Martin Oldfield <m@mjo.tc>, based on # work that is copyright Nicholas Zambetti, David A. Mellis & Hernando # Barragan. -# +# # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU Lesser General Public License as # published by the Free Software Foundation; either version 2.1 of the @@ -39,13 +42,13 @@ # # 0.6 22.vi.2011 M J Oldfield # - added ard-parse-boards supports -# - added -lc to linker opts, +# - added -lc to linker opts, # on Fabien Le Lez's advice # # 0.7 12.vii.2011 M J Oldfield # - moved -lm to the end of linker opts, # to solve Frank Knopf's problem; -# - added -F to stty opts: Craig Hollabaugh +# - added -F to stty opts: Craig Hollabaugh # reckons it's good for Ubuntu # # 0.8 12.ii.2012 M J Oldfield @@ -72,12 +75,47 @@ # defined (ex Peplin) # - Added a monitor target which talks to the # Arduino serial port (Peplin's suggestion) -# - Rejigged PATH calculations for general +# - Rejigged PATH calculations for general # tidiness (ex Peplin) # - Moved the reset target to Perl for # clarity and better error handling (ex # Daniele Vergini) # +# 0.9.1 06.vi.2012 Sudar +# - Corrected the ubuntu package names +# - Prevent the *file-not-found* error if the depends.mk file is not needed +# - Delete the build-cli folder as well while doing make clean +# - Added support for compiling .pde files in Arduino 1.0 environment +# - Replaced = with += in CPPFLAGS assignment so that we can set CPPFLAGS per sketch if needed +# - Changed AVRDUDE_CONF so it can be defined in per-project makefile (https://github.com/WizenedEE) +# - Cleaner way to delete the build-cli directory when make clean is invoked +# - The package name in Debian and Ubuntu is arduino-mk (https://github.com/maqifrnswa) +# +# +# 0.9.2 06.vi.2012 Sudar +# - Allow user to choose source files (LOCAL_*_SRCS flags) (https://github.com/Gaftech) +# - Modified 'make size' behavior: using --mcu option and targeting .elf file instead of .hex file.(https://github.com/Gaftech) +# +# 0.9.3 13.vi.2012 Sudar +# - Autodetect ARDUINO_DIR, Arduino version (https://github.com/rpavlik/) +# - Categorize libs into user and system (https://github.com/rpavlik/) +# - Dump size at the end of the build (https://github.com/rpavlik/) +# - Lots and lots of improvements (https://github.com/rpavlik/) +# - Changed bytes option for the head shell command, so that it works in Mac as well +# - Auto detect Serial Baud rate from sketch if possible +# +# 0.9.3.1 18.viii.2012 jeffkowalski +# - Autodetect ARDUINO_LIBS from includes in LOCAL_SRCS +# - Autodetect ARDUINO_SKETCHBOOK from file +# set by Arduino IDE +# - Autodetect ARDMK_DIR based on location of +# this file +# - Added support for utility directory +# within SYS and USER libraries +# +# 0.9.3.2 10.ix.2012 Sudar +# - Fixed a typo in README. Issue reported at upstream (https://github.com/mjoldfield/Arduino-Makefile/issues/21) +# # 0.10 17.ix.12 M J Oldfield # - Added installation notes for Fedora (ex Rickard Lindberg). # - Changed size target so that it looks at the ELF object, @@ -90,6 +128,32 @@ # - Added support for USB_PID/VID used by the Leonardo (ex Dan # Villiom Podlaski Christiansen and Marc Plano-Lesay). # +# 0.10.1 15.xii.2012 Sudar +# - Merged all changes from Upstream and from https://github.com/rpavlik +# - Allow passing extra flags (https://github.com/rpavlik) +# - Make listing files more useful (https://github.com/rpavlik) +# - Add knowledge of device-specific assembler (https://github.com/rpavlik) +# - Use variables instead of hardcoded commands (https://github.com/rpavlik) +# - Make disasm more helpful (https://github.com/rpavlik) +# - Change .sym output (https://github.com/rpavlik) +# - Provide symbol_sizes and generated_assembly targets. (https://github.com/rpavlik) +# - Be able to silence configuration output (https://github.com/rpavlik) +# - Make everybody depend on the makefile, in case cflags are changed, etc. (https://github.com/rpavlik) +# - Make the makefile error if the arduino port is not present. (https://github.com/rpavlik) +# +# 0.10.2 15.xii.2012 Sudar +# - Added sketch size verification. (https://github.com/fornellas) +# - Show original line number for error messages (https://github.com/WizenedEE) +# - Removed -w from CPPFLAGS to show warnings (https://github.com/gaftech) +# - Changed shebang to use /usr/bin/env (https://github.com/anm) +# - set USB_VID and USB_PID only for leonardo boards(https://github.com/alohr) +# +# 0.10.3 16.xii 2012 gaftech +# - Enabling creation of EEPROM file (.eep) +# - EEPROM upload: eeprom and raw_eeprom targets +# - Auto EEPROM upload with isp mode: ISP_EEPROM option. +# - Allow custom OBJDIR +# ######################################################################## # # PATHS YOU NEED TO SET UP @@ -102,7 +166,7 @@ # 1. Things which are included in this distribution e.g. ard-parse-boards # => ARDMK_DIR # -# 2. Things which are always in the Arduino distribution e.g. +# 2. Things which are always in the Arduino distribution e.g. # boards.txt, libraries, &c. # => ARDUINO_DIR # @@ -126,13 +190,18 @@ # ARDMK_DIR = /usr/local # AVR_TOOLS_DIR = /usr # -# You can either set these up in the Makefile, or put them in your +# You can either set these up in the Makefile, or put them in your # environment e.g. in your .bashrc # +# If you don't specify these, we can try to guess, but that might not work +# or work the way you want it to. +# # If you don't install the ard-... binaries to /usr/local/bin, but # instead copy them to e.g. /home/mjo/arduino.mk/bin then set # ARDML_DIR = /home/mjo/arduino.mk -# +# +# If you'd rather not see the configuration output, define ARDUINO_QUIET. +# ######################################################################## # # DEPENDENCIES @@ -159,16 +228,28 @@ # Hopefully these will be self-explanatory but in case they're not: # # ARDUINO_LIBS - A list of any libraries used by the sketch (we -# assume these are in -# $(ARDUINO_DIR)/hardware/libraries +# assume these are in $(ARDUINO_DIR)/hardware/libraries +# or your sketchbook's libraries directory) # # ARDUINO_PORT - The port where the Arduino can be found (only needed -# when uploading +# when uploading) # # BOARD_TAG - The ard-parse-boards tag for the board e.g. uno or mega # 'make show_boards' shows a list # -# Once this file has been created the typical workflow is just +# If you have your additional libraries relative to your source, rather +# than in your "sketchbook", also set USER_LIB_PATH, like this example: +# +# USER_LIB_PATH := $(realpath ../../libraries) +# +# If you've added the Arduino-Makefile repository to your git repo as a +# submodule (or other similar arrangement), you might have lines like this +# in your Makefile: +# +# ARDMK_DIR := $(realpath ../../tools/Arduino-Makefile) +# include $(ARDMK_DIR)/arduino-mk/Arduino.mk +# +# In any case, once this file has been created the typical workflow is just # # $ make upload # @@ -188,13 +269,22 @@ # make raw_upload - upload without first resetting # make show_boards - list all the boards defined in boards.txt # make monitor - connect to the Arduino's serial port +# make size - show the size of the compiled output (relative to +# resources, if you have a patched avr-size) +# make disasm - generate a .lss file in build-cli that contains +# disassembly of the compiled file interspersed +# with your original source code. +# make verify_size - Verify that the size of the final file is less than +# the capacity of the micro controller. +# make eeprom - upload the eep file +# make raw_eeprom - upload the eep file without first resetting # ######################################################################## # # SERIAL MONITOR # # The serial monitor just invokes the GNU screen program with suitable -# options. For more information see screen (1) and search for +# options. For more information see screen (1) and search for # 'character special device'. # # The really useful thing to know is that ^A-k gets you out! @@ -205,46 +295,8 @@ # bindkey ^C kill # # If you want to change the baudrate, just set MONITOR_BAUDRATE. If you -# don't set it, it defaults to 9600 baud. -# -######################################################################## -# -# PATHS -# -# I've reworked the way paths to executables are constructed in this -# version of Makefile. -# -# We need to worry about three different sorts of file: -# -# 1. Things which are included in this distribution e.g. ard-parse-boards -# => ARDMK_DIR -# -# 2. Things which are always in the Arduino distribution e.g. -# boards.txt, libraries, &c. -# => ARDUINO_DIR -# -# 3. Things which might be bundled with the Arduino distribution, but -# might come from the system. Most of the toolchain is like this: -# on Linux it's supplied by the system. -# => AVR_TOOLS_DIR -# -# Having set these three variables, we can work out the rest assuming -# that things are canonically arranged beneath the directories defined -# above. -# -# So, on the Mac you might want to set: -# -# ARDUINO_DIR = /Applications/Arduino.app/Contents/Resources/Java -# ARDMK_DIR = /usr/local -# -# On Linux, you might prefer: -# -# ARDUINO_DIR = /usr/share/arduino -# ARDMK_DIR = /usr/local -# AVR_TOOLS_DIR = /usr -# -# -# +# don't set it, it tries to read from the sketch. If it couldn't read +# from the sketch, then it defaults to 9600 baud. # ######################################################################## # @@ -258,16 +310,19 @@ # # You might also need to set the fuse bits, but typically they'll be # read from boards.txt, based on the BOARD_TAG variable: -# +# # ISP_LOCK_FUSE_PRE = 0x3f # ISP_LOCK_FUSE_POST = 0xcf # ISP_HIGH_FUSE = 0xdf # ISP_LOW_FUSE = 0xff # ISP_EXT_FUSE = 0x01 # +# You can specify to also upload the EEPROM file: +# ISP_EEPROM = 1 +# # I think the fuses here are fine for uploading to the ATmega168 # without bootloader. -# +# # To actually do this upload use the ispload target: # # make ispload @@ -275,19 +330,72 @@ # ######################################################################## +# Useful functions +# Returns the first argument (typically a directory), if the file or directory +# named by concatenating the first and optionally second argument +# (directory and optional filename) exists +dir_if_exists = $(if $(wildcard $(1)$(2)),$(1)) + +# For message printing: pad the right side of the first argument with spaces to +# the number of bytes indicated by the second argument. +space_pad_to = $(shell echo $(1) " " | head -c$(2)) + +ifndef ARDUINO_QUIET + arduino_output = $(info $(1)) +else + arduino_output = +endif + +# Call with some text, and a prefix tag if desired (like [AUTODETECTED]), +show_config_info = $(call arduino_output,- $(call space_pad_to,$(2),20) $(1)) + +# Call with the name of the variable, a prefix tag if desired (like [AUTODETECTED]), +# and an explanation if desired (like (found in $$PATH) +show_config_variable = $(call show_config_info,$(1) = $($(1)) $(3),$(2)) + +# Just a nice simple visual separator +show_separator = $(call arduino_output,-------------------------) + + +$(call show_separator) +$(call arduino_output,Arduino.mk Configuration:) + +ifndef ARDUINO_DIR + AUTO_ARDUINO_DIR := $(firstword \ + $(call dir_if_exists,/usr/share/arduino) \ + $(call dir_if_exists,/Applications/Arduino.app/Contents/Resources/Java) ) + ifdef AUTO_ARDUINO_DIR + ARDUINO_DIR = $(AUTO_ARDUINO_DIR) + $(call show_config_variable,ARDUINO_DIR,[AUTODETECTED]) + endif + +else + $(call show_config_variable,ARDUINO_DIR) +endif + ######################################################################## -# +# # Default TARGET to cwd (ex Daniele Vergini) ifndef TARGET -TARGET = $(notdir $(CURDIR)) + TARGET = $(notdir $(CURDIR)) endif ######################################################################## - -# # Arduino version number ifndef ARDUINO_VERSION -ARDUINO_VERSION = 100 + + # Remove all the decimals, and right-pad with zeros, and finally grab the first 3 bytes. + # Works for 1.0 and 1.0.1 + AUTO_ARDUINO_VERSION := $(shell cat $(ARDUINO_DIR)/lib/version.txt | sed -e 's/[.]//g' -e 's/$$/0000/' | head -c3) + ifdef AUTO_ARDUINO_VERSION + ARDUINO_VERSION = $(AUTO_ARDUINO_VERSION) + $(call show_config_variable,ARDUINO_VERSION,[AUTODETECTED]) + else + ARDUINO_VERSION = 100 + $(call show_config_variable,ARDUINO_VERSION,[DEFAULT]) + endif +else + $(call show_config_variable,ARDUINO_VERSION) endif ######################################################################## @@ -295,52 +403,104 @@ endif # ifdef ARDUINO_DIR -ifndef AVR_TOOLS_DIR -AVR_TOOLS_DIR = $(ARDUINO_DIR)/hardware/tools/avr -# The avrdude bundled with Arduino can't find its config -ifndef AVRDUDE_CONF -AVRDUDE_CONF = $(AVR_TOOLS_DIR)/etc/avrdude.conf -endif -endif + ifndef AVR_TOOLS_DIR -ifndef AVR_TOOLS_PATH -AVR_TOOLS_PATH = $(AVR_TOOLS_DIR)/bin -endif + BUNDLED_AVR_TOOLS_DIR := $(call dir_if_exists,$(ARDUINO_DIR)/hardware/tools/avr) + ifdef BUNDLED_AVR_TOOLS_DIR + AVR_TOOLS_DIR = $(BUNDLED_AVR_TOOLS_DIR) + # The avrdude bundled with Arduino can't find it's config + AVRDUDE_CONF = $(AVR_TOOLS_DIR)/etc/avrdude.conf + $(call show_config_variable,AVR_TOOLS_DIR,[BUNDLED],(in Arduino distribution)) + + else + + SYSTEMPATH_AVR_TOOLS_DIR := $(call dir_if_exists,$(abspath $(dir $(shell which avr-gcc))/..)) + ifdef SYSTEMPATH_AVR_TOOLS_DIR + AVR_TOOLS_DIR = $(SYSTEMPATH_AVR_TOOLS_DIR) + $(call show_config_variable,AVR_TOOLS_DIR,[AUTODETECTED],(found in $$PATH)) + endif # SYSTEMPATH_AVR_TOOLS_DIR + + endif # BUNDLED_AVR_TOOLS_DIR + + else + + $(call show_config_variable,AVR_TOOLS_DIR) + endif #ndef AVR_TOOLS_DIR -ARDUINO_LIB_PATH = $(ARDUINO_DIR)/libraries -ARDUINO_CORE_PATH = $(ARDUINO_DIR)/hardware/arduino/cores/arduino -ARDUINO_VAR_PATH = $(ARDUINO_DIR)/hardware/arduino/variants + ARDUINO_LIB_PATH = $(ARDUINO_DIR)/libraries + $(call show_config_variable,ARDUINO_LIB_PATH,[COMPUTED],(from ARDUINO_DIR)) + ARDUINO_CORE_PATH = $(ARDUINO_DIR)/hardware/arduino/cores/arduino + ARDUINO_VAR_PATH = $(ARDUINO_DIR)/hardware/arduino/variants else -echo $(error "ARDUINO_DIR is not defined") + echo $(error "ARDUINO_DIR is not defined") + +endif + +ifdef AVR_TOOLS_DIR + + ifndef AVR_TOOLS_PATH + AVR_TOOLS_PATH = $(AVR_TOOLS_DIR)/bin + endif endif ######################################################################## # Makefile distribution path # -ifdef ARDMK_DIR - -ifndef ARDMK_PATH -ARDMK_PATH = $(ARDMK_DIR)/bin +ifndef ARDMK_DIR + # presume it's a level above the path to our own file + ARDMK_DIR := $(realpath $(dir $(realpath $(lastword $(MAKEFILE_LIST))))/..) + $(call show_config_variable,ARDMK_DIR,[COMPUTED],(relative to $(notdir $(lastword $(MAKEFILE_LIST))))) +else + $(call show_config_variable,ARDMK_DIR,[USER]) endif +ifdef ARDMK_DIR + ifndef ARDMK_PATH + ARDMK_PATH = $(ARDMK_DIR)/bin + $(call show_config_variable,ARDMK_PATH,[COMPUTED],(relative to ARDMK_DIR)) + else + $(call show_config_variable,ARDMK_PATH) + endif else - -echo $(error "ARDMK_DIR is not defined") - + echo $(error "ARDMK_DIR is not defined") endif + ######################################################################## # Miscellanea # ifndef ARDUINO_SKETCHBOOK -ARDUINO_SKETCHBOOK = $(HOME)/sketchbook + ifneq ($(wildcard $(HOME)/.arduino/preferences.txt),) + ARDUINO_SKETCHBOOK = $(shell grep --max-count=1 --regexp="sketchbook.path=" \ + $(HOME)/.arduino/preferences.txt | \ + sed -e 's/sketchbook.path=//' ) + endif + + # on mac + ifneq ($(wildcard $(HOME)/Library/Arduino/preferences.txt),) + ARDUINO_SKETCHBOOK = $(shell grep --max-count=1 --regexp="sketchbook.path=" \ + $(HOME)/Library/Arduino/preferences.txt | \ + sed -e 's/sketchbook.path=//' ) + endif + + ifneq ($(ARDUINO_SKETCHBOOK),) + $(call show_config_variable,ARDUINO_SKETCHBOOK,[AUTODETECTED],(in arduino preferences file)) + else + ARDUINO_SKETCHBOOK = $(HOME)/sketchbook + $(call show_config_variable,ARDUINO_SKETCHBOOK,[DEFAULT]) + endif +else + $(call show_config_variable,ARDUINO_SKETCHBOOK) endif ifndef USER_LIB_PATH -USER_LIB_PATH = $(ARDUINO_SKETCHBOOK)/libraries + USER_LIB_PATH = $(ARDUINO_SKETCHBOOK)/libraries + $(call show_config_variable,USER_LIB_PATH,[DEFAULT],(in user sketchbook)) +else + $(call show_config_variable,USER_LIB_PATH) endif ######################################################################## @@ -351,56 +511,71 @@ endif # for more information (search for 'character special device'). # ifndef MONITOR_BAUDRATE -MONITOR_BAUDRATE = 9600 + #This works only in linux. TODO: Port it to MAC OS also + SPEED = $(shell grep --max-count=1 --regexp="Serial.begin" $$(ls -1 *.ino) | sed -e 's/\t//g' -e 's/\/\/.*$$//g' -e 's/(/\t/' -e 's/)/\t/' | awk -F '\t' '{print $$2}' ) + MONITOR_BAUDRATE = $(findstring $(SPEED),300 1200 2400 4800 9600 14400 19200 28800 38400 57600 115200) + + ifeq ($(MONITOR_BAUDRATE),) + MONITOR_BAUDRATE = 9600 + $(call show_config_variable,MONITOR_BAUDRATE,[ASSUMED]) + else + $(call show_config_variable,MONITOR_BAUDRATE,[DETECTED], (in sketch)) + endif +else + $(call show_config_variable,MONITOR_BAUDRATE, [SPECIFIED]) endif ifndef MONITOR_CMD -MONITOR_CMD = screen + MONITOR_CMD = screen endif ######################################################################## # Reset ifndef RESET_CMD -RESET_CMD = $(ARDMK_PATH)/ard-reset-arduino $(ARD_RESET_OPTS) + RESET_CMD = $(ARDMK_PATH)/ard-reset-arduino $(ARD_RESET_OPTS) endif ######################################################################## # boards.txt parsing # ifndef BOARD_TAG -BOARD_TAG = uno + BOARD_TAG = uno + $(call show_config_variable,BOARD_TAG,[DEFAULT]) +else + $(call show_config_variable,BOARD_TAG) endif ifndef BOARDS_TXT -BOARDS_TXT = $(ARDUINO_DIR)/hardware/arduino/boards.txt + BOARDS_TXT = $(ARDUINO_DIR)/hardware/arduino/boards.txt endif ifndef PARSE_BOARD -PARSE_BOARD = $(ARDMK_PATH)/ard-parse-boards + PARSE_BOARD = $(ARDMK_PATH)/ard-parse-boards endif ifndef PARSE_BOARD_OPTS -PARSE_BOARD_OPTS = --boards_txt=$(BOARDS_TXT) + PARSE_BOARD_OPTS = --boards_txt=$(BOARDS_TXT) endif ifndef PARSE_BOARD_CMD -PARSE_BOARD_CMD = $(PARSE_BOARD) $(PARSE_BOARD_OPTS) + PARSE_BOARD_CMD = $(PARSE_BOARD) $(PARSE_BOARD_OPTS) endif # Which variant ? This affects the include path ifndef VARIANT -VARIANT = $(shell $(PARSE_BOARD_CMD) $(BOARD_TAG) build.variant) + VARIANT = $(shell $(PARSE_BOARD_CMD) $(BOARD_TAG) build.variant) endif # processor stuff ifndef MCU -MCU = $(shell $(PARSE_BOARD_CMD) $(BOARD_TAG) build.mcu) + MCU = $(shell $(PARSE_BOARD_CMD) $(BOARD_TAG) build.mcu) endif ifndef F_CPU -F_CPU = $(shell $(PARSE_BOARD_CMD) $(BOARD_TAG) build.f_cpu) + F_CPU = $(shell $(PARSE_BOARD_CMD) $(BOARD_TAG) build.f_cpu) endif +ifeq ($(VARIANT),leonardo) # USB IDs for the Leonardo ifndef USB_VID USB_VID = $(shell $(PARSE_BOARD_CMD) $(BOARD_TAG) build.vid) @@ -409,35 +584,36 @@ endif ifndef USB_PID USB_PID = $(shell $(PARSE_BOARD_CMD) $(BOARD_TAG) build.pid) endif +endif # normal programming info ifndef AVRDUDE_ARD_PROGRAMMER -AVRDUDE_ARD_PROGRAMMER = $(shell $(PARSE_BOARD_CMD) $(BOARD_TAG) upload.protocol) + AVRDUDE_ARD_PROGRAMMER = $(shell $(PARSE_BOARD_CMD) $(BOARD_TAG) upload.protocol) endif ifndef AVRDUDE_ARD_BAUDRATE -AVRDUDE_ARD_BAUDRATE = $(shell $(PARSE_BOARD_CMD) $(BOARD_TAG) upload.speed) + AVRDUDE_ARD_BAUDRATE = $(shell $(PARSE_BOARD_CMD) $(BOARD_TAG) upload.speed) endif # fuses if you're using e.g. ISP ifndef ISP_LOCK_FUSE_PRE -ISP_LOCK_FUSE_PRE = $(shell $(PARSE_BOARD_CMD) $(BOARD_TAG) bootloader.unlock_bits) + ISP_LOCK_FUSE_PRE = $(shell $(PARSE_BOARD_CMD) $(BOARD_TAG) bootloader.unlock_bits) endif ifndef ISP_LOCK_FUSE_POST -ISP_LOCK_FUSE_POST = $(shell $(PARSE_BOARD_CMD) $(BOARD_TAG) bootloader.lock_bits) + ISP_LOCK_FUSE_POST = $(shell $(PARSE_BOARD_CMD) $(BOARD_TAG) bootloader.lock_bits) endif ifndef ISP_HIGH_FUSE -ISP_HIGH_FUSE = $(shell $(PARSE_BOARD_CMD) $(BOARD_TAG) bootloader.high_fuses) + ISP_HIGH_FUSE = $(shell $(PARSE_BOARD_CMD) $(BOARD_TAG) bootloader.high_fuses) endif ifndef ISP_LOW_FUSE -ISP_LOW_FUSE = $(shell $(PARSE_BOARD_CMD) $(BOARD_TAG) bootloader.low_fuses) + ISP_LOW_FUSE = $(shell $(PARSE_BOARD_CMD) $(BOARD_TAG) bootloader.low_fuses) endif ifndef ISP_EXT_FUSE -ISP_EXT_FUSE = $(shell $(PARSE_BOARD_CMD) $(BOARD_TAG) bootloader.extended_fuses) + ISP_EXT_FUSE = $(shell $(PARSE_BOARD_CMD) $(BOARD_TAG) bootloader.extended_fuses) endif # Everything gets built in here (include BOARD_TAG now) @@ -445,15 +621,22 @@ ifndef OBJDIR OBJDIR = build-$(BOARD_TAG) endif +ifndef HEX_MAXIMUM_SIZE +HEX_MAXIMUM_SIZE = $(shell $(PARSE_BOARD_CMD) $(BOARD_TAG) upload.maximum_size) +endif + ######################################################################## # Local sources # -LOCAL_C_SRCS = $(wildcard *.c) -LOCAL_CPP_SRCS = $(wildcard *.cpp) -LOCAL_CC_SRCS = $(wildcard *.cc) -LOCAL_PDE_SRCS = $(wildcard *.pde) -LOCAL_INO_SRCS = $(wildcard *.ino) -LOCAL_AS_SRCS = $(wildcard *.S) +LOCAL_C_SRCS ?= $(wildcard *.c) +LOCAL_CPP_SRCS ?= $(wildcard *.cpp) +LOCAL_CC_SRCS ?= $(wildcard *.cc) +LOCAL_PDE_SRCS ?= $(wildcard *.pde) +LOCAL_INO_SRCS ?= $(wildcard *.ino) +LOCAL_AS_SRCS ?= $(wildcard *.S) +LOCAL_SRCS = $(LOCAL_C_SRCS) $(LOCAL_CPP_SRCS) \ + $(LOCAL_CC_SRCS) $(LOCAL_PDE_SRCS) \ + $(LOCAL_INO_SRCS) $(LOCAL_AS_SRCS) LOCAL_OBJ_FILES = $(LOCAL_C_SRCS:.c=.o) $(LOCAL_CPP_SRCS:.cpp=.o) \ $(LOCAL_CC_SRCS:.cc=.o) $(LOCAL_PDE_SRCS:.pde=.o) \ $(LOCAL_INO_SRCS:.ino=.o) $(LOCAL_AS_SRCS:.S=.o) @@ -464,21 +647,34 @@ DEPS = $(LOCAL_OBJS:.o=.d) # core sources ifeq ($(strip $(NO_CORE)),) -ifdef ARDUINO_CORE_PATH -CORE_C_SRCS = $(wildcard $(ARDUINO_CORE_PATH)/*.c) -CORE_CPP_SRCS = $(wildcard $(ARDUINO_CORE_PATH)/*.cpp) - -ifneq ($(strip $(NO_CORE_MAIN_CPP)),) -CORE_CPP_SRCS := $(filter-out %main.cpp, $(CORE_CPP_SRCS)) + ifdef ARDUINO_CORE_PATH + CORE_C_SRCS = $(wildcard $(ARDUINO_CORE_PATH)/*.c) + CORE_CPP_SRCS = $(wildcard $(ARDUINO_CORE_PATH)/*.cpp) + + ifneq ($(strip $(NO_CORE_MAIN_CPP)),) + CORE_CPP_SRCS := $(filter-out %main.cpp, $(CORE_CPP_SRCS)) + $(call show_config_info,NO_CORE_MAIN_CPP set so core library will not include main.cpp,[MANUAL]) + endif + + CORE_OBJ_FILES = $(CORE_C_SRCS:.c=.o) $(CORE_CPP_SRCS:.cpp=.o) + CORE_OBJS = $(patsubst $(ARDUINO_CORE_PATH)/%, \ + $(OBJDIR)/%,$(CORE_OBJ_FILES)) + endif +else + $(call show_config_info,NO_CORE set so core library will not be built,[MANUAL]) endif -CORE_OBJ_FILES = $(CORE_C_SRCS:.c=.o) $(CORE_CPP_SRCS:.cpp=.o) -CORE_OBJS = $(patsubst $(ARDUINO_CORE_PATH)/%, \ - $(OBJDIR)/%,$(CORE_OBJ_FILES)) -endif +######################################################################## +# Determine ARDUINO_LIBS automatically +# +ifndef ARDUINO_LIBS + # automatically determine included libraries + ARDUINO_LIBS += $(filter $(notdir $(wildcard $(ARDUINO_DIR)/libraries/*)), \ + $(shell sed -ne "s/^ *\# *include *[<\"]\(.*\)\.h[>\"]/\1/p" $(LOCAL_SRCS))) + ARDUINO_LIBS += $(filter $(notdir $(wildcard $(ARDUINO_SKETCHBOOK)/libraries/*)), \ + $(shell sed -ne "s/^ *\# *include *[<\"]\(.*\)\.h[>\"]/\1/p" $(LOCAL_SRCS))) endif - ######################################################################## # Rules for making stuff # @@ -486,6 +682,7 @@ endif # The name of the main targets TARGET_HEX = $(OBJDIR)/$(TARGET).hex TARGET_ELF = $(OBJDIR)/$(TARGET).elf +TARGET_EEP = $(OBJDIR)/$(TARGET).eep TARGETS = $(OBJDIR)/$(TARGET).* CORE_LIB = $(OBJDIR)/libcore.a @@ -495,19 +692,33 @@ DEP_FILE = $(OBJDIR)/depends.mk # Names of executables CC = $(AVR_TOOLS_PATH)/avr-gcc CXX = $(AVR_TOOLS_PATH)/avr-g++ +AS = $(AVR_TOOLS_PATH)/avr-as OBJCOPY = $(AVR_TOOLS_PATH)/avr-objcopy OBJDUMP = $(AVR_TOOLS_PATH)/avr-objdump AR = $(AVR_TOOLS_PATH)/avr-ar SIZE = $(AVR_TOOLS_PATH)/avr-size NM = $(AVR_TOOLS_PATH)/avr-nm -REMOVE = rm -f +REMOVE = rm -rf MV = mv -f CAT = cat ECHO = echo # General arguments -SYS_LIBS = $(patsubst %,$(ARDUINO_LIB_PATH)/%,$(ARDUINO_LIBS)) -USER_LIBS = $(patsubst %,$(USER_LIB_PATH)/%,$(ARDUINO_LIBS)) +USER_LIBS = $(wildcard $(patsubst %,$(USER_LIB_PATH)/%,$(ARDUINO_LIBS))) +USER_LIB_NAMES= $(patsubst $(USER_LIB_PATH)/%,%,$(USER_LIBS)) + +# Let user libraries override system ones. +SYS_LIBS = $(wildcard $(patsubst %,$(ARDUINO_LIB_PATH)/%,$(filter-out $(USER_LIB_NAMES),$(ARDUINO_LIBS)))) +SYS_LIB_NAMES = $(patsubst $(ARDUINO_LIB_PATH)/%,%,$(SYS_LIBS)) + +# Error here if any are missing. +LIBS_NOT_FOUND = $(filter-out $(USER_LIB_NAMES) $(SYS_LIB_NAMES),$(ARDUINO_LIBS)) +ifneq (,$(strip $(LIBS_NOT_FOUND))) + $(error The following libraries specified in ARDUINO_LIBS could not be found (searched USER_LIB_PATH and ARDUINO_LIB_PATH): $(LIBS_NOT_FOUND)) +endif + +SYS_LIBS := $(wildcard $(SYS_LIBS) $(addsuffix /utility,$(SYS_LIBS))) +USER_LIBS := $(wildcard $(USER_LIBS) $(addsuffix /utility,$(USER_LIBS))) SYS_INCLUDES = $(patsubst %,-I%,$(SYS_LIBS)) USER_INCLUDES = $(patsubst %,-I%,$(USER_LIBS)) LIB_C_SRCS = $(wildcard $(patsubst %,%/*.c,$(SYS_LIBS))) @@ -519,19 +730,50 @@ LIB_OBJS = $(patsubst $(ARDUINO_LIB_PATH)/%.c,$(OBJDIR)/libs/%.o,$(LIB_C_SR USER_LIB_OBJS = $(patsubst $(USER_LIB_PATH)/%.cpp,$(OBJDIR)/libs/%.o,$(USER_LIB_CPP_SRCS)) \ $(patsubst $(USER_LIB_PATH)/%.c,$(OBJDIR)/libs/%.o,$(USER_LIB_C_SRCS)) -CPPFLAGS = -mmcu=$(MCU) -DF_CPU=$(F_CPU) -DARDUINO=$(ARDUINO_VERSION) \ +# Using += instead of =, so that CPPFLAGS can be set per sketch level +CPPFLAGS += -mmcu=$(MCU) -DF_CPU=$(F_CPU) -DARDUINO=$(ARDUINO_VERSION) \ -I. -I$(ARDUINO_CORE_PATH) -I$(ARDUINO_VAR_PATH)/$(VARIANT) \ - $(SYS_INCLUDES) $(USER_INCLUDES) -g -Os -w -Wall \ + $(SYS_INCLUDES) $(USER_INCLUDES) -g -Os -Wall \ -DUSB_VID=$(USB_VID) -DUSB_PID=$(USB_PID) \ -ffunction-sections -fdata-sections +CFLAGS += -std=gnu99 $(EXTRA_FLAGS) $(EXTRA_CFLAGS) +CXXFLAGS += -fno-exceptions $(EXTRA_FLAGS) $(EXTRA_CXXFLAGS) +ASFLAGS += -mmcu=$(MCU) -I. -x assembler-with-cpp +LDFLAGS += -mmcu=$(MCU) -Wl,--gc-sections -Os $(EXTRA_FLAGS) $(EXTRA_CXXFLAGS) +SIZEFLAGS ?= --mcu=$(MCU) -C + +# Returns the Arduino port (first wildcard expansion) if it exists, otherwise it errors. +get_arduino_port = $(if $(wildcard $(ARDUINO_PORT)),$(firstword $(wildcard $(ARDUINO_PORT))),$(error Arduino port $(ARDUINO_PORT) not found!)) + +# Command for avr_size: do $(call avr_size,elffile,hexfile) +ifneq (,$(findstring AVR,$(shell $(SIZE) --help))) + # We have a patched version of binutils that mentions AVR - pass the MCU + # and the elf to get nice output. + #avr_size = $(SIZE) --mcu=$(MCU) --format=avr $(1) + avr_size = $(SIZE) $(SIZEFLAGS) --format=avr $(1) + $(call show_config_info,Size utility: AVR-aware for enhanced output,[AUTODETECTED]) +else + # We have a plain-old binutils version - just give it the hex. + avr_size = $(SIZE) $(2) + $(call show_config_info,Size utility: Basic (not AVR-aware),[AUTODETECTED]) +endif + -CFLAGS = -std=gnu99 -CXXFLAGS = -fno-exceptions -ASFLAGS = -mmcu=$(MCU) -I. -x assembler-with-cpp -LDFLAGS = -mmcu=$(MCU) -Wl,--gc-sections -Os +ifneq (,$(strip $(ARDUINO_LIBS))) + $(call arduino_output,-) + $(call show_config_info,ARDUINO_LIBS =) +endif +ifneq (,$(strip $(USER_LIB_NAMES))) + $(foreach lib,$(USER_LIB_NAMES),$(call show_config_info, $(lib),[USER])) +endif + +ifneq (,$(strip $(SYS_LIB_NAMES))) + $(foreach lib,$(SYS_LIB_NAMES),$(call show_config_info, $(lib),[SYSTEM])) +endif + +# end of config output +$(call show_separator) -# Expand and pick the first port -ARD_PORT = $(firstword $(wildcard $(ARDUINO_PORT))) # Implicit rules for building everything (needed to get everything in # the right directory) @@ -561,101 +803,137 @@ $(OBJDIR)/libs/%.o: $(USER_LIB_PATH)/%.c # normal local sources # .o rules are for objects, .d for dependency tracking # there seems to be an awful lot of duplication here!!! -$(OBJDIR)/%.o: %.c +COMMON_DEPS := Makefile +$(OBJDIR)/%.o: %.c $(COMMON_DEPS) $(CC) -c $(CPPFLAGS) $(CFLAGS) $< -o $@ -$(OBJDIR)/%.o: %.cc +$(OBJDIR)/%.o: %.cc $(COMMON_DEPS) $(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $< -o $@ -$(OBJDIR)/%.o: %.cpp +$(OBJDIR)/%.o: %.cpp $(COMMON_DEPS) $(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $< -o $@ -$(OBJDIR)/%.o: %.S +$(OBJDIR)/%.o: %.S $(COMMON_DEPS) $(CC) -c $(CPPFLAGS) $(ASFLAGS) $< -o $@ -$(OBJDIR)/%.o: %.s +$(OBJDIR)/%.o: %.s $(COMMON_DEPS) $(CC) -c $(CPPFLAGS) $(ASFLAGS) $< -o $@ -$(OBJDIR)/%.d: %.c +$(OBJDIR)/%.d: %.c $(COMMON_DEPS) $(CC) -MM $(CPPFLAGS) $(CFLAGS) $< -MF $@ -MT $(@:.d=.o) -$(OBJDIR)/%.d: %.cc +$(OBJDIR)/%.d: %.cc $(COMMON_DEPS) $(CXX) -MM $(CPPFLAGS) $(CXXFLAGS) $< -MF $@ -MT $(@:.d=.o) -$(OBJDIR)/%.d: %.cpp +$(OBJDIR)/%.d: %.cpp $(COMMON_DEPS) $(CXX) -MM $(CPPFLAGS) $(CXXFLAGS) $< -MF $@ -MT $(@:.d=.o) -$(OBJDIR)/%.d: %.S +$(OBJDIR)/%.d: %.S $(COMMON_DEPS) $(CC) -MM $(CPPFLAGS) $(ASFLAGS) $< -MF $@ -MT $(@:.d=.o) -$(OBJDIR)/%.d: %.s +$(OBJDIR)/%.d: %.s $(COMMON_DEPS) $(CC) -MM $(CPPFLAGS) $(ASFLAGS) $< -MF $@ -MT $(@:.d=.o) +#backward compatibility for .pde files +# We should check for Arduino version, if the file is .pde because a .pde file might be used in Arduino 1.0 # the pde -> cpp -> o file -$(OBJDIR)/%.cpp: %.pde - $(ECHO) '#include "WProgram.h"' > $@ +$(OBJDIR)/%.cpp: %.pde $(COMMON_DEPS) + $(ECHO) '#if ARDUINO >= 100\n #include "Arduino.h"\n#else\n #include "WProgram.h"\n#endif\n#line 1' > $@ $(CAT) $< >> $@ # the ino -> cpp -> o file -$(OBJDIR)/%.cpp: %.ino - $(ECHO) '#include <Arduino.h>' > $@ +$(OBJDIR)/%.cpp: %.ino $(COMMON_DEPS) + $(ECHO) '#include <Arduino.h>\n#line 1' > $@ $(CAT) $< >> $@ -$(OBJDIR)/%.o: $(OBJDIR)/%.cpp +$(OBJDIR)/%.o: $(OBJDIR)/%.cpp $(COMMON_DEPS) $(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $< -o $@ -$(OBJDIR)/%.d: $(OBJDIR)/%.cpp +$(OBJDIR)/%.d: $(OBJDIR)/%.cpp $(COMMON_DEPS) $(CXX) -MM $(CPPFLAGS) $(CXXFLAGS) $< -MF $@ -MT $(@:.d=.o) +# generated assembly +$(OBJDIR)/%.s: $(OBJDIR)/%.cpp $(COMMON_DEPS) + $(CXX) -S -fverbose-asm $(CPPFLAGS) $(CXXFLAGS) $< -o $@ + +#$(OBJDIR)/%.lst: $(OBJDIR)/%.s +# $(AS) -mmcu=$(MCU) -alhnd $< > $@ + # core files -$(OBJDIR)/%.o: $(ARDUINO_CORE_PATH)/%.c +$(OBJDIR)/%.o: $(ARDUINO_CORE_PATH)/%.c $(COMMON_DEPS) $(CC) -c $(CPPFLAGS) $(CFLAGS) $< -o $@ -$(OBJDIR)/%.o: $(ARDUINO_CORE_PATH)/%.cpp +$(OBJDIR)/%.o: $(ARDUINO_CORE_PATH)/%.cpp $(COMMON_DEPS) $(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $< -o $@ # various object conversions -$(OBJDIR)/%.hex: $(OBJDIR)/%.elf +$(OBJDIR)/%.hex: $(OBJDIR)/%.elf $(COMMON_DEPS) $(OBJCOPY) -O ihex -R .eeprom $< $@ + @$(ECHO) + @$(ECHO) + $(call avr_size,$<,$@) -$(OBJDIR)/%.eep: $(OBJDIR)/%.elf +$(OBJDIR)/%.eep: $(OBJDIR)/%.elf $(COMMON_DEPS) -$(OBJCOPY) -j .eeprom --set-section-flags=.eeprom="alloc,load" \ --change-section-lma .eeprom=0 -O ihex $< $@ -$(OBJDIR)/%.lss: $(OBJDIR)/%.elf - $(OBJDUMP) -h -S $< > $@ +$(OBJDIR)/%.lss: $(OBJDIR)/%.elf $(COMMON_DEPS) + $(OBJDUMP) -h --source --demangle --wide $< > $@ -$(OBJDIR)/%.sym: $(OBJDIR)/%.elf - $(NM) -n $< > $@ +$(OBJDIR)/%.sym: $(OBJDIR)/%.elf $(COMMON_DEPS) + $(NM) --size-sort --demangle --reverse-sort --line-numbers $< > $@ ######################################################################## # # Avrdude # ifndef AVRDUDE -AVRDUDE = $(AVR_TOOLS_PATH)/avrdude + AVRDUDE = $(AVR_TOOLS_PATH)/avrdude +endif + +ifndef AVRDUDE_CONF +ifndef AVR_TOOLS_DIR +# The avrdude bundled with Arduino can't find its config +AVRDUDE_CONF = $(AVR_TOOLS_DIR)/etc/avrdude.conf +endif +# If avrdude is installed separately, it can find its own config flie endif AVRDUDE_COM_OPTS = -q -V -p $(MCU) ifdef AVRDUDE_CONF -AVRDUDE_COM_OPTS += -C $(AVRDUDE_CONF) + AVRDUDE_COM_OPTS += -C $(AVRDUDE_CONF) endif -AVRDUDE_ARD_OPTS = -c $(AVRDUDE_ARD_PROGRAMMER) -b $(AVRDUDE_ARD_BAUDRATE) -P $(ARD_PORT) +AVRDUDE_ARD_OPTS = -c $(AVRDUDE_ARD_PROGRAMMER) -b $(AVRDUDE_ARD_BAUDRATE) -P $(call get_arduino_port) ifndef ISP_PROG -ISP_PROG = -c stk500v2 + ISP_PROG = -c stk500v2 +endif + +# usb seems to be a reasonable default, at least on linux +ifndef ISP_PORT + ISP_PORT = usb endif AVRDUDE_ISP_OPTS = -P $(ISP_PORT) $(ISP_PROG) +ifndef ISP_EEPROM + ISP_EEPROM = 0 +endif + +AVRDUDE_UPLOAD_HEX = -U flash:w:$(TARGET_HEX):i +AVRDUDE_UPLOAD_EEP = -U eeprom:w:$(TARGET_EEP):i +AVRDUDE_ISPLOAD_OPTS = $(AVRDUDE_UPLOAD_HEX) +ifneq ($(ISP_EEPROM), 0) + AVRDUDE_ISPLOAD_OPTS += $(AVRDUDE_UPLOAD_EEP) +endif ######################################################################## # # Explicit targets start here # -all: $(OBJDIR) $(TARGET_HEX) +all: $(OBJDIR) $(TARGET_EEP) $(TARGET_HEX) verify_size $(OBJDIR): mkdir $(OBJDIR) @@ -669,52 +947,76 @@ $(CORE_LIB): $(CORE_OBJS) $(LIB_OBJS) $(USER_LIB_OBJS) $(DEP_FILE): $(OBJDIR) $(DEPS) cat $(DEPS) > $(DEP_FILE) -upload: reset raw_upload +upload: raw_upload -raw_upload: $(TARGET_HEX) +raw_upload: reset $(TARGET_HEX) verify_size $(AVRDUDE) $(AVRDUDE_COM_OPTS) $(AVRDUDE_ARD_OPTS) \ - -U flash:w:$(TARGET_HEX):i + $(AVRDUDE_UPLOAD_HEX) -reset: - $(RESET_CMD) $(ARD_PORT) +eeprom: reset raw_eeprom + +raw_eeprom: $(TARGET_EEP) $(TARGET_HEX) + $(AVRDUDE) $(AVRDUDE_COM_OPTS) $(AVRDUDE_ARD_OPTS) \ + $(AVRDUDE_UPLOAD_EEP) + +reset: + $(RESET_CMD) $(call get_arduino_port) # stty on MacOS likes -F, but on Debian it likes -f redirecting # stdin/out appears to work but generates a spurious error on MacOS at # least. Perhaps it would be better to just do it in perl ? -reset_stty: +reset_stty: for STTYF in 'stty -F' 'stty --file' 'stty -f' 'stty <' ; \ do $$STTYF /dev/tty >/dev/null 2>/dev/null && break ; \ done ;\ - $$STTYF $(ARD_PORT) hupcl ;\ + $$STTYF $(call get_arduino_port) hupcl ;\ (sleep 0.1 || sleep 1) ;\ - $$STTYF $(ARD_PORT) -hupcl + $$STTYF $(call get_arduino_port) -hupcl -ispload: $(TARGET_HEX) +ispload: $(TARGET_EEP) $(TARGET_HEX) verify_size $(AVRDUDE) $(AVRDUDE_COM_OPTS) $(AVRDUDE_ISP_OPTS) -e \ -U lock:w:$(ISP_LOCK_FUSE_PRE):m \ -U hfuse:w:$(ISP_HIGH_FUSE):m \ -U lfuse:w:$(ISP_LOW_FUSE):m \ -U efuse:w:$(ISP_EXT_FUSE):m $(AVRDUDE) $(AVRDUDE_COM_OPTS) $(AVRDUDE_ISP_OPTS) -D \ - -U flash:w:$(TARGET_HEX):i + $(AVRDUDE_ISPLOAD_OPTS) $(AVRDUDE) $(AVRDUDE_COM_OPTS) $(AVRDUDE_ISP_OPTS) \ -U lock:w:$(ISP_LOCK_FUSE_POST):m clean: - $(REMOVE) $(LOCAL_OBJS) $(CORE_OBJS) $(LIB_OBJS) $(CORE_LIB) $(TARGETS) $(DEP_FILE) $(DEPS) $(USER_LIB_OBJS) + $(REMOVE) $(LOCAL_OBJS) $(CORE_OBJS) $(LIB_OBJS) $(CORE_LIB) $(TARGETS) $(DEP_FILE) $(DEPS) $(USER_LIB_OBJS) ${OBJDIR} depends: $(DEPS) - cat $(DEPS) > $(DEP_FILE) + $(CAT) $(DEPS) > $(DEP_FILE) -size: $(OBJDIR) $(TARGET_ELF) - $(SIZE) -C --mcu=$(MCU) $(TARGET_ELF) +size: $(OBJDIR) $(TARGET_HEX) + $(call avr_size,$(TARGET_ELF),$(TARGET_HEX)) -show_boards: +show_boards: $(PARSE_BOARD_CMD) --boards monitor: - $(MONITOR_CMD) $(ARD_PORT) $(MONITOR_BAUDRATE) + $(MONITOR_CMD) $(call get_arduino_port) $(MONITOR_BAUDRATE) + +disasm: $(OBJDIR)/$(TARGET).lss + @$(ECHO) The compiled ELF file has been disassembled to $(OBJDIR)/$(TARGET).lss + +symbol_sizes: $(OBJDIR)/$(TARGET).sym + @$(ECHO) A symbol listing sorted by their size have been dumped to $(OBJDIR)/$(TARGET).sym -.PHONY: all clean depends upload raw_upload reset reset_stty size show_boards monitor +$(TARGET_HEX).sizeok: $(TARGET_HEX) + $(ARDMK_PATH)/ard-verify-size $(TARGET_HEX) $(HEX_MAXIMUM_SIZE) + touch $@ -include $(DEP_FILE) +verify_size: $(TARGET_HEX) $(TARGET_HEX).sizeok + +generated_assembly: $(OBJDIR)/$(TARGET).s + @$(ECHO) Compiler-generated assembly for the main input source has been dumped to $(OBJDIR)/$(TARGET).s + +.PHONY: all upload raw_upload reset reset_stty ispload clean depends size show_boards monitor disasm symbol_sizes generated_assembly verify_size + +# added - in the beginning, so that we don't get an error if the file is not present +ifneq ($(MAKECMDGOALS),clean) +-include $(DEP_FILE) +endif |