From f7a307e34950452e0aa739b53c2d6459e6b67824 Mon Sep 17 00:00:00 2001 From: James Goppert Date: Mon, 26 Sep 2011 20:29:09 -0400 Subject: [PATCH 1/2] Added override for mega upload protocol. --- libraries/AP_Common/Arduino.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libraries/AP_Common/Arduino.mk b/libraries/AP_Common/Arduino.mk index 8d34a6fd54..cbce48c6bc 100644 --- a/libraries/AP_Common/Arduino.mk +++ b/libraries/AP_Common/Arduino.mk @@ -330,6 +330,12 @@ ifeq ($(UPLOAD_PROTOCOL),) UPLOAD_PROTOCOL := $(shell grep $(BOARD).upload.protocol $(BOARDFILE) | cut -d = -f 2) endif +# Adding override for mega since boards.txt uses stk500 instead of +# arduino on 22 release +ifeq ($(BOARD),"mega") +UPLOAD_PROTOCOL := "arduino" +endif + ifeq ($(MCU),) $(error ERROR: Could not locate board $(BOARD) in $(BOARDFILE)) endif From af105c6967f3a50d0928f56a5270884eb410d562 Mon Sep 17 00:00:00 2001 From: Amilcar Lucas Date: Tue, 27 Sep 2011 04:40:00 +0200 Subject: [PATCH 2/2] fix quotes and indentation --- libraries/AP_Common/Arduino.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libraries/AP_Common/Arduino.mk b/libraries/AP_Common/Arduino.mk index cbce48c6bc..0ff6796b31 100644 --- a/libraries/AP_Common/Arduino.mk +++ b/libraries/AP_Common/Arduino.mk @@ -327,13 +327,13 @@ HARDWARE_CORE := $(shell grep $(BOARD).build.core $(BOARDFILE) | cut -d = -f 2) UPLOAD_SPEED := $(shell grep $(BOARD).upload.speed $(BOARDFILE) | cut -d = -f 2) ifeq ($(UPLOAD_PROTOCOL),) -UPLOAD_PROTOCOL := $(shell grep $(BOARD).upload.protocol $(BOARDFILE) | cut -d = -f 2) + UPLOAD_PROTOCOL := $(shell grep $(BOARD).upload.protocol $(BOARDFILE) | cut -d = -f 2) endif # Adding override for mega since boards.txt uses stk500 instead of # arduino on 22 release -ifeq ($(BOARD),"mega") -UPLOAD_PROTOCOL := "arduino" +ifeq ($(BOARD),mega) + UPLOAD_PROTOCOL := arduino endif ifeq ($(MCU),)