dominic/Arduino-Makefile
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

merge changes from https://github.com/sudar

Browse source
This commit is contained in:
gabriel 2012-12-16 17:06:23 +01:00
commit e3b86053eb
5 changed files with 207 additions and 64 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
README.md
View file

@ -37,14 +37,30 @@ On Linux, you might prefer:
AVR_TOOLS_DIR = /usr AVR_TOOLS_DIR = /usr
The Makefile also delegates resetting the board to a short Perl program. The Makefile also delegates resetting the board to a short Perl program.
You'll need to install Device::SerialPort to use it though. On Debian or You'll need to install `Device::SerialPort` to use it though. You'll also
Ubuntu do need the `YAML` library to run ard-parse-boards.
apt-get install libdevice-serialport-perl libconfig-yaml-perl On Debian or Ubuntu:
On other systems apt-get install libdevice-serial-perl
apt-get install libyaml-perl
On Fedora:
yum install perl-Device-SerialPort
yum install perl-YAML
On Mac using MacPorts:
sudo port install p5-device-serialport
sudo port install p5-YAML
and use /opt/local/bin/perl5 instead of /usr/bin/perl
On other systems:
cpanm Device::SerialPort cpanm Device::SerialPort
cpanm YAML
## User Libraries ## User Libraries
@ -91,6 +107,29 @@ The following are the list of changes that I have made or merged in this fork. H
### 0.9.3.2 10.ix.2012 Sudar ### 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) - 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
- Merged all changes from Upstream
### 0.10.1 15.xii.2012 Sudar
- Merged all changes from Upstream and the following changes from https://github.com/rpavlik
- Allow passing extra flags
- Make listing files more useful
- Add knowledge of device-specific assembler
- Use variables instead of hardcoded commands
- Make disasm more helpful
- Change .sym output
- Provide symbol_sizes and generated_assembly targets.
- Be able to silence configuration output
- Make everybody depend on the makefile, in case cflags are changed, etc.
- Make the makefile error if the arduino port is not present.
### 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)
## Know Issues ## Know Issues
- Because of the way the makefile is structured, the configuration parameters gets printed twice. - Because of the way the makefile is structured, the configuration parameters gets printed twice.
- Doesn't work with Leonardo yet. - Doesn't work with Leonardo yet.

209
arduino-mk/Arduino.mk
View file

@ -113,9 +113,46 @@
# - Added support for utility directory # - Added support for utility directory
# within SYS and USER libraries # within SYS and USER libraries
# #
# ?.?.?.? 09.xi.2012 gaftech # 0.9.3.2 10.ix.2012 Sudar
# - Add EEPROM upload support: eeprom and raw_eeprom targets # - Fixed a typo in README. Issue reported at upstream (https://github.com/mjoldfield/Arduino-Makefile/issues/21)
# and ISP_EEPROM option. #
# 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,
# not the hexfile (ex Jared Szechy and Scott Howard).
# - Fixed ARDUNIO typo in README.md (ex Kalin Kozhuharov).
# - Tweaked OBJDIR handling (ex Matthias Urlichs and Scott Howard).
# - Changed the name of the Debian/Ubuntu package (ex
# Scott Howard).
# - Only set AVRDUDE_CONF if it's not set (ex Tom Hall).
# - 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
# #
######################################################################## ########################################################################
# #
@ -163,6 +200,8 @@
# instead copy them to e.g. /home/mjo/arduino.mk/bin then set # instead copy them to e.g. /home/mjo/arduino.mk/bin then set
# ARDML_DIR = /home/mjo/arduino.mk # ARDML_DIR = /home/mjo/arduino.mk
# #
# If you'd rather not see the configuration output, define ARDUINO_QUIET.
#
######################################################################## ########################################################################
# #
# DEPENDENCIES # DEPENDENCIES
@ -235,6 +274,10 @@
# make disasm - generate a .lss file in build-cli that contains # make disasm - generate a .lss file in build-cli that contains
# disassembly of the compiled file interspersed # disassembly of the compiled file interspersed
# with your original source code. # 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
# #
######################################################################## ########################################################################
# #
@ -274,6 +317,9 @@
# ISP_LOW_FUSE = 0xff # ISP_LOW_FUSE = 0xff
# ISP_EXT_FUSE = 0x01 # 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 # I think the fuses here are fine for uploading to the ATmega168
# without bootloader. # without bootloader.
# #
@ -294,19 +340,25 @@ dir_if_exists = $(if $(wildcard $(1)$(2)),$(1))
# the number of bytes indicated by the second argument. # the number of bytes indicated by the second argument.
space_pad_to = $(shell echo $(1) " " | head -c$(2)) 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]), # Call with some text, and a prefix tag if desired (like [AUTODETECTED]),
show_config_info = $(info - $(call space_pad_to,$(2),20) $(1)) 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]), # Call with the name of the variable, a prefix tag if desired (like [AUTODETECTED]),
# and an explanation if desired (like (found in $$PATH) # and an explanation if desired (like (found in $$PATH)
show_config_variable = $(call show_config_info,$(1) = $($(1)) $(3),$(2)) show_config_variable = $(call show_config_info,$(1) = $($(1)) $(3),$(2))
# Just a nice simple visual separator # Just a nice simple visual separator
show_separator = $(info -------------------------) show_separator = $(call arduino_output,-------------------------)
$(call show_separator) $(call show_separator)
$(info Arduino.mk Configuration:) $(call arduino_output,Arduino.mk Configuration:)
ifndef ARDUINO_DIR ifndef ARDUINO_DIR
AUTO_ARDUINO_DIR := $(firstword \ AUTO_ARDUINO_DIR := $(firstword \
@ -515,6 +567,17 @@ 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 endif
ifeq ($(VARIANT),leonardo)
# USB IDs for the Leonardo
ifndef USB_VID
USB_VID = $(shell $(PARSE_BOARD_CMD) $(BOARD_TAG) build.vid)
endif
ifndef USB_PID
USB_PID = $(shell $(PARSE_BOARD_CMD) $(BOARD_TAG) build.pid)
endif
endif
# normal programming info # normal programming info
ifndef AVRDUDE_ARD_PROGRAMMER 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)
@ -545,8 +608,14 @@ 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 endif
# Everything gets built in here # Everything gets built in here (include BOARD_TAG now)
OBJDIR ?= build-cli 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 sources
@ -615,6 +684,7 @@ DEP_FILE = $(OBJDIR)/depends.mk
# Names of executables # Names of executables
CC = $(AVR_TOOLS_PATH)/avr-gcc CC = $(AVR_TOOLS_PATH)/avr-gcc
CXX = $(AVR_TOOLS_PATH)/avr-g++ CXX = $(AVR_TOOLS_PATH)/avr-g++
AS = $(AVR_TOOLS_PATH)/avr-as
OBJCOPY = $(AVR_TOOLS_PATH)/avr-objcopy OBJCOPY = $(AVR_TOOLS_PATH)/avr-objcopy
OBJDUMP = $(AVR_TOOLS_PATH)/avr-objdump OBJDUMP = $(AVR_TOOLS_PATH)/avr-objdump
AR = $(AVR_TOOLS_PATH)/avr-ar AR = $(AVR_TOOLS_PATH)/avr-ar
@ -656,15 +726,16 @@ USER_LIB_OBJS = $(patsubst $(USER_LIB_PATH)/%.cpp,$(OBJDIR)/libs/%.o,$(USER_LIB_
CPPFLAGS += -mmcu=$(MCU) -DF_CPU=$(F_CPU) -DARDUINO=$(ARDUINO_VERSION) \ CPPFLAGS += -mmcu=$(MCU) -DF_CPU=$(F_CPU) -DARDUINO=$(ARDUINO_VERSION) \
-I. -I$(ARDUINO_CORE_PATH) -I$(ARDUINO_VAR_PATH)/$(VARIANT) \ -I. -I$(ARDUINO_CORE_PATH) -I$(ARDUINO_VAR_PATH)/$(VARIANT) \
$(SYS_INCLUDES) $(USER_INCLUDES) -g -Os -Wall \ $(SYS_INCLUDES) $(USER_INCLUDES) -g -Os -Wall \
-DUSB_VID=$(USB_VID) -DUSB_PID=$(USB_PID) \
-ffunction-sections -fdata-sections -ffunction-sections -fdata-sections
CFLAGS += -std=gnu99 CFLAGS += -std=gnu99 $(EXTRA_FLAGS) $(EXTRA_CFLAGS)
CXXFLAGS += -fno-exceptions CXXFLAGS += -fno-exceptions $(EXTRA_FLAGS) $(EXTRA_CXXFLAGS)
ASFLAGS += -mmcu=$(MCU) -I. -x assembler-with-cpp ASFLAGS += -mmcu=$(MCU) -I. -x assembler-with-cpp
LDFLAGS += -mmcu=$(MCU) -Wl,--gc-sections -Os LDFLAGS += -mmcu=$(MCU) -Wl,--gc-sections -Os $(EXTRA_FLAGS) $(EXTRA_CXXFLAGS)
SIZEFLAGS ?= --mcu=$(MCU) -C SIZEFLAGS ?= --mcu=$(MCU) -C
# Expand and pick the first port # Returns the Arduino port (first wildcard expansion) if it exists, otherwise it errors.
ARD_PORT = $(firstword $(wildcard $(ARDUINO_PORT))) 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) # Command for avr_size: do $(call avr_size,elffile,hexfile)
ifneq (,$(findstring AVR,$(shell $(SIZE) --help))) ifneq (,$(findstring AVR,$(shell $(SIZE) --help)))
@ -681,7 +752,7 @@ endif
ifneq (,$(strip $(ARDUINO_LIBS))) ifneq (,$(strip $(ARDUINO_LIBS)))
$(info -) $(call arduino_output,-)
$(call show_config_info,ARDUINO_LIBS =) $(call show_config_info,ARDUINO_LIBS =)
endif endif
ifneq (,$(strip $(USER_LIB_NAMES))) ifneq (,$(strip $(USER_LIB_NAMES)))
@ -724,77 +795,85 @@ $(OBJDIR)/libs/%.o: $(USER_LIB_PATH)/%.c
# normal local sources # normal local sources
# .o rules are for objects, .d for dependency tracking # .o rules are for objects, .d for dependency tracking
# there seems to be an awful lot of duplication here!!! # 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 $@ $(CC) -c $(CPPFLAGS) $(CFLAGS) $< -o $@
$(OBJDIR)/%.o: %.cc $(OBJDIR)/%.o: %.cc $(COMMON_DEPS)
$(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $< -o $@ $(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $< -o $@
$(OBJDIR)/%.o: %.cpp $(OBJDIR)/%.o: %.cpp $(COMMON_DEPS)
$(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $< -o $@ $(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $< -o $@
$(OBJDIR)/%.o: %.S $(OBJDIR)/%.o: %.S $(COMMON_DEPS)
$(CC) -c $(CPPFLAGS) $(ASFLAGS) $< -o $@ $(CC) -c $(CPPFLAGS) $(ASFLAGS) $< -o $@
$(OBJDIR)/%.o: %.s $(OBJDIR)/%.o: %.s $(COMMON_DEPS)
$(CC) -c $(CPPFLAGS) $(ASFLAGS) $< -o $@ $(CC) -c $(CPPFLAGS) $(ASFLAGS) $< -o $@
$(OBJDIR)/%.d: %.c $(OBJDIR)/%.d: %.c $(COMMON_DEPS)
$(CC) -MM $(CPPFLAGS) $(CFLAGS) $< -MF $@ -MT $(@:.d=.o) $(CC) -MM $(CPPFLAGS) $(CFLAGS) $< -MF $@ -MT $(@:.d=.o)
$(OBJDIR)/%.d: %.cc $(OBJDIR)/%.d: %.cc $(COMMON_DEPS)
$(CXX) -MM $(CPPFLAGS) $(CXXFLAGS) $< -MF $@ -MT $(@:.d=.o) $(CXX) -MM $(CPPFLAGS) $(CXXFLAGS) $< -MF $@ -MT $(@:.d=.o)
$(OBJDIR)/%.d: %.cpp $(OBJDIR)/%.d: %.cpp $(COMMON_DEPS)
$(CXX) -MM $(CPPFLAGS) $(CXXFLAGS) $< -MF $@ -MT $(@:.d=.o) $(CXX) -MM $(CPPFLAGS) $(CXXFLAGS) $< -MF $@ -MT $(@:.d=.o)
$(OBJDIR)/%.d: %.S $(OBJDIR)/%.d: %.S $(COMMON_DEPS)
$(CC) -MM $(CPPFLAGS) $(ASFLAGS) $< -MF $@ -MT $(@:.d=.o) $(CC) -MM $(CPPFLAGS) $(ASFLAGS) $< -MF $@ -MT $(@:.d=.o)
$(OBJDIR)/%.d: %.s $(OBJDIR)/%.d: %.s $(COMMON_DEPS)
$(CC) -MM $(CPPFLAGS) $(ASFLAGS) $< -MF $@ -MT $(@:.d=.o) $(CC) -MM $(CPPFLAGS) $(ASFLAGS) $< -MF $@ -MT $(@:.d=.o)
#backward compatibility for .pde files #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 # 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 # the pde -> cpp -> o file
$(OBJDIR)/%.cpp: %.pde $(OBJDIR)/%.cpp: %.pde $(COMMON_DEPS)
$(ECHO) '#if ARDUINO >= 100\n #include "Arduino.h"\n#else\n #include "WProgram.h"\n#endif' > $@ $(ECHO) '#if ARDUINO >= 100\n #include "Arduino.h"\n#else\n #include "WProgram.h"\n#endif\n#line 1' > $@
$(CAT) $< >> $@ $(CAT) $< >> $@
# the ino -> cpp -> o file # the ino -> cpp -> o file
$(OBJDIR)/%.cpp: %.ino $(OBJDIR)/%.cpp: %.ino $(COMMON_DEPS)
$(ECHO) '#include <Arduino.h>' > $@ $(ECHO) '#include <Arduino.h>\n#line 1' > $@
$(CAT) $< >> $@ $(CAT) $< >> $@
$(OBJDIR)/%.o: $(OBJDIR)/%.cpp $(OBJDIR)/%.o: $(OBJDIR)/%.cpp $(COMMON_DEPS)
$(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $< -o $@ $(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $< -o $@
$(OBJDIR)/%.d: $(OBJDIR)/%.cpp $(OBJDIR)/%.d: $(OBJDIR)/%.cpp $(COMMON_DEPS)
$(CXX) -MM $(CPPFLAGS) $(CXXFLAGS) $< -MF $@ -MT $(@:.d=.o) $(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 # core files
$(OBJDIR)/%.o: $(ARDUINO_CORE_PATH)/%.c $(OBJDIR)/%.o: $(ARDUINO_CORE_PATH)/%.c $(COMMON_DEPS)
$(CC) -c $(CPPFLAGS) $(CFLAGS) $< -o $@ $(CC) -c $(CPPFLAGS) $(CFLAGS) $< -o $@
$(OBJDIR)/%.o: $(ARDUINO_CORE_PATH)/%.cpp $(OBJDIR)/%.o: $(ARDUINO_CORE_PATH)/%.cpp $(COMMON_DEPS)
$(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $< -o $@ $(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $< -o $@
# various object conversions # various object conversions
$(OBJDIR)/%.hex: $(OBJDIR)/%.elf $(OBJDIR)/%.hex: $(OBJDIR)/%.elf $(COMMON_DEPS)
$(OBJCOPY) -O ihex -R .eeprom $< $@ $(OBJCOPY) -O ihex -R .eeprom $< $@
@echo @$(ECHO)
@echo @$(ECHO)
$(call avr_size,$<,$@) $(call avr_size,$<,$@)
$(OBJDIR)/%.eep: $(OBJDIR)/%.elf $(OBJDIR)/%.eep: $(OBJDIR)/%.elf $(COMMON_DEPS)
-$(OBJCOPY) -j .eeprom --set-section-flags=.eeprom="alloc,load" \ -$(OBJCOPY) -j .eeprom --set-section-flags=.eeprom="alloc,load" \
--change-section-lma .eeprom=0 -O ihex $< $@ --change-section-lma .eeprom=0 -O ihex $< $@
$(OBJDIR)/%.lss: $(OBJDIR)/%.elf $(OBJDIR)/%.lss: $(OBJDIR)/%.elf $(COMMON_DEPS)
$(OBJDUMP) -h -S $< > $@ $(OBJDUMP) -h --source --demangle --wide $< > $@
$(OBJDIR)/%.sym: $(OBJDIR)/%.elf $(OBJDIR)/%.sym: $(OBJDIR)/%.elf $(COMMON_DEPS)
$(NM) -n $< > $@ $(NM) --size-sort --demangle --reverse-sort --line-numbers $< > $@
######################################################################## ########################################################################
# #
@ -817,7 +896,7 @@ ifdef AVRDUDE_CONF
AVRDUDE_COM_OPTS += -C $(AVRDUDE_CONF) AVRDUDE_COM_OPTS += -C $(AVRDUDE_CONF)
endif 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 ifndef ISP_PROG
ISP_PROG = -c stk500v2 ISP_PROG = -c stk500v2
@ -834,9 +913,11 @@ ifndef ISP_EEPROM
ISP_EEPROM = 0 ISP_EEPROM = 0
endif endif
AVRDUDE_MEM_OPTS = -U flash:w:$(TARGET_HEX):i 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) ifneq ($(ISP_EEPROM), 0)
AVRDUDE_MEM_OPTS += -U eeprom:w:$(TARGET_EEP):i AVRDUDE_ISPLOAD_OPTS += $(AVRDUDE_UPLOAD_EEP)
endif endif
######################################################################## ########################################################################
@ -844,7 +925,7 @@ endif
# Explicit targets start here # Explicit targets start here
# #
all: $(OBJDIR) $(TARGET_EEP) $(TARGET_HEX) all: $(OBJDIR) $(TARGET_EEP) $(TARGET_HEX) verify_size
$(OBJDIR): $(OBJDIR):
mkdir $(OBJDIR) mkdir $(OBJDIR)
@ -858,19 +939,20 @@ $(CORE_LIB): $(CORE_OBJS) $(LIB_OBJS) $(USER_LIB_OBJS)
$(DEP_FILE): $(OBJDIR) $(DEPS) $(DEP_FILE): $(OBJDIR) $(DEPS)
cat $(DEPS) > $(DEP_FILE) 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) \ $(AVRDUDE) $(AVRDUDE_COM_OPTS) $(AVRDUDE_ARD_OPTS) \
-U flash:w:$(TARGET_HEX):i $(AVRDUDE_UPLOAD_HEX)
eeprom: reset raw_eeprom eeprom: reset raw_eeprom
raw_eeprom: $(TARGET_EEP) $(TARGET_HEX) raw_eeprom: $(TARGET_EEP) $(TARGET_HEX)
$(AVRDUDE) $(AVRDUDE_COM_OPTS) $(AVRDUDE_ARD_OPTS) $(AVRDUDE_MEM_OPTS) $(AVRDUDE) $(AVRDUDE_COM_OPTS) $(AVRDUDE_ARD_OPTS) \
$(AVRDUDE_UPLOAD_EEP)
reset: reset:
$(RESET_CMD) $(ARD_PORT) $(RESET_CMD) $(call get_arduino_port)
# stty on MacOS likes -F, but on Debian it likes -f redirecting # 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 # stdin/out appears to work but generates a spurious error on MacOS at
@ -879,18 +961,18 @@ reset_stty:
for STTYF in 'stty -F' 'stty --file' 'stty -f' 'stty <' ; \ for STTYF in 'stty -F' 'stty --file' 'stty -f' 'stty <' ; \
do $$STTYF /dev/tty >/dev/null 2>/dev/null && break ; \ do $$STTYF /dev/tty >/dev/null 2>/dev/null && break ; \
done ;\ done ;\
$$STTYF $(ARD_PORT) hupcl ;\ $$STTYF $(call get_arduino_port) hupcl ;\
(sleep 0.1 || sleep 1) ;\ (sleep 0.1 || sleep 1) ;\
$$STTYF $(ARD_PORT) -hupcl $$STTYF $(call get_arduino_port) -hupcl
ispload: $(TARGET_EEP) $(TARGET_HEX) ispload: $(TARGET_EEP) $(TARGET_HEX) verify_size
$(AVRDUDE) $(AVRDUDE_COM_OPTS) $(AVRDUDE_ISP_OPTS) -e \ $(AVRDUDE) $(AVRDUDE_COM_OPTS) $(AVRDUDE_ISP_OPTS) -e \
-U lock:w:$(ISP_LOCK_FUSE_PRE):m \ -U lock:w:$(ISP_LOCK_FUSE_PRE):m \
-U hfuse:w:$(ISP_HIGH_FUSE):m \ -U hfuse:w:$(ISP_HIGH_FUSE):m \
-U lfuse:w:$(ISP_LOW_FUSE):m \ -U lfuse:w:$(ISP_LOW_FUSE):m \
-U efuse:w:$(ISP_EXT_FUSE):m -U efuse:w:$(ISP_EXT_FUSE):m
$(AVRDUDE) $(AVRDUDE_COM_OPTS) $(AVRDUDE_ISP_OPTS) -D \ $(AVRDUDE) $(AVRDUDE_COM_OPTS) $(AVRDUDE_ISP_OPTS) -D \
$(AVRDUDE_MEM_OPTS) $(AVRDUDE_ISPLOAD_OPTS)
$(AVRDUDE) $(AVRDUDE_COM_OPTS) $(AVRDUDE_ISP_OPTS) \ $(AVRDUDE) $(AVRDUDE_COM_OPTS) $(AVRDUDE_ISP_OPTS) \
-U lock:w:$(ISP_LOCK_FUSE_POST):m -U lock:w:$(ISP_LOCK_FUSE_POST):m
@ -898,7 +980,7 @@ clean:
$(REMOVE) $(LOCAL_OBJS) $(CORE_OBJS) $(LIB_OBJS) $(CORE_LIB) $(TARGETS) $(DEP_FILE) $(DEPS) $(USER_LIB_OBJS) ${OBJDIR} $(REMOVE) $(LOCAL_OBJS) $(CORE_OBJS) $(LIB_OBJS) $(CORE_LIB) $(TARGETS) $(DEP_FILE) $(DEPS) $(USER_LIB_OBJS) ${OBJDIR}
depends: $(DEPS) depends: $(DEPS)
cat $(DEPS) > $(DEP_FILE) $(CAT) $(DEPS) > $(DEP_FILE)
size: $(OBJDIR) $(TARGET_HEX) size: $(OBJDIR) $(TARGET_HEX)
$(call avr_size,$(TARGET_ELF),$(TARGET_HEX)) $(call avr_size,$(TARGET_ELF),$(TARGET_HEX))
@ -907,11 +989,24 @@ show_boards:
$(PARSE_BOARD_CMD) --boards $(PARSE_BOARD_CMD) --boards
monitor: monitor:
$(MONITOR_CMD) $(ARD_PORT) $(MONITOR_BAUDRATE) $(MONITOR_CMD) $(call get_arduino_port) $(MONITOR_BAUDRATE)
disasm: all $(OBJDIR)/$(TARGET).lss disasm: $(OBJDIR)/$(TARGET).lss
@$(ECHO) The compiled ELF file has been disassembled to $(OBJDIR)/$(TARGET).lss
.PHONY: all clean depends upload raw_upload reset reset_stty size show_boards monitor symbol_sizes: $(OBJDIR)/$(TARGET).sym
@$(ECHO) A symbol listing sorted by their size have been dumped to $(OBJDIR)/$(TARGET).sym
$(TARGET_HEX).sizeok: $(TARGET_HEX)
$(ARDMK_PATH)/ard-verify-size $(TARGET_HEX) $(HEX_MAXIMUM_SIZE)
touch $@
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 # added - in the beginning, so that we don't get an error if the file is not present
ifneq ($(MAKECMDGOALS),clean) ifneq ($(MAKECMDGOALS),clean)

4
bin/ard-parse-boards
View file

@ -1,4 +1,4 @@
#! /usr/bin/perl #! /usr/bin/env perl
use strict; use strict;
use warnings; use warnings;
@ -9,7 +9,7 @@ use YAML;
my %Opt = my %Opt =
( (
boards_txt => '/Applications/Arduino.app/Contents/Resources/Java/hardware/arduino/boards.txt', boards_txt => "$ENV{'ARDUINO_DIR'}/hardware/arduino/boards.txt",
); );
GetOptions(\%Opt, GetOptions(\%Opt,

2
bin/ard-reset-arduino
View file

@ -1,4 +1,4 @@
#! /usr/bin/perl #! /usr/bin/env perl
use strict; use strict;
use warnings; use warnings;

9
bin/ard-verify-size Executable file
View file

@ -0,0 +1,9 @@
#!/bin/bash
TARGET_HEX="$1"
MAX_SIZE="$2"
HEX_SIZE="$(cut -c12- < $TARGET_HEX | tr -d \\n | tr -d \\r | wc -c | awk '{print $1/2}')"
if [ $HEX_SIZE -gt $MAX_SIZE ]
then
echo "Sketch size is ${HEX_SIZE} bytes and maximum allowed is ${MAX_SIZE} bytes; see http://www.arduino.cc/en/Guide/Troubleshooting#size for tips on reducing it." 1>&2
exit 1
fi