diff options
| author | Martin Oldfield <github-2012-02-24@mjo.tc> | 2012-04-28 09:49:46 -0700 |
|---|---|---|
| committer | Martin Oldfield <github-2012-02-24@mjo.tc> | 2012-04-28 09:49:46 -0700 |
| commit | 72c4fabdbad2cf04e513b49ff5763f9ca2c1c052 (patch) | |
| tree | 8578ea0a13087c5e6fa3a89c441116321edea3b3 /arduino-mk | |
| parent | 3b18056404fe9fdeade920e5e72ead3d40feb7ef (diff) | |
| parent | 94b26b284d0a797c307bb9acfa20b39e0c1e978e (diff) | |
Merge pull request #14 from brotchie/master
Fix for using --boards_txt on Linux.
Diffstat (limited to 'arduino-mk')
| -rw-r--r-- | arduino-mk/Arduino.mk | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/arduino-mk/Arduino.mk b/arduino-mk/Arduino.mk index 2d88e43..5e8cf8e 100644 --- a/arduino-mk/Arduino.mk +++ b/arduino-mk/Arduino.mk @@ -243,46 +243,46 @@ endif # Which variant ? This affects the include path ifndef VARIANT -VARIANT = $(shell $(PARSE_BOARD) $(BOARD_TAG) build.variant) +VARIANT = $(shell $(PARSE_BOARD_CMD) $(BOARD_TAG) build.variant) endif # processor stuff ifndef MCU -MCU = $(shell $(PARSE_BOARD) $(BOARD_TAG) build.mcu) +MCU = $(shell $(PARSE_BOARD_CMD) $(BOARD_TAG) build.mcu) endif ifndef F_CPU -F_CPU = $(shell $(PARSE_BOARD) $(BOARD_TAG) build.f_cpu) +F_CPU = $(shell $(PARSE_BOARD_CMD) $(BOARD_TAG) build.f_cpu) endif # normal programming info ifndef AVRDUDE_ARD_PROGRAMMER -AVRDUDE_ARD_PROGRAMMER = $(shell $(PARSE_BOARD) $(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) $(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) $(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) $(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) $(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) $(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) $(BOARD_TAG) bootloader.extended_fuses) +ISP_EXT_FUSE = $(shell $(PARSE_BOARD_CMD) $(BOARD_TAG) bootloader.extended_fuses) endif # Everything gets built in here @@ -548,7 +548,7 @@ size: $(OBJDIR) $(TARGET_HEX) $(SIZE) $(TARGET_HEX) show_boards: - $(PARSE_BOARD) --boards + $(PARSE_BOARD_CMD) --boards .PHONY: all clean depends upload raw_upload reset size show_boards |