From 815be5ddfeb99d744463b76f199b9530e09782af Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Mon, 23 Sep 2013 14:19:51 +1000 Subject: [PATCH] build: fixed libmaple upload target --- mk/board_flymaple.mk | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/mk/board_flymaple.mk b/mk/board_flymaple.mk index 53ea4a07f0..be12c0d432 100644 --- a/mk/board_flymaple.mk +++ b/mk/board_flymaple.mk @@ -90,12 +90,6 @@ else v = endif -# Maple library -# Unlike AP on Arduino, AP on Flymaple uses parts of the core -ifeq ($(LIBMAPLE_PATH),) -LIBMAPLE_PATH := /usr/local/src/libmaple -endif - COREOBJS = $(LIBMAPLE_PATH)/build/libmaple/*.o $(LIBMAPLE_PATH)/build/libmaple/usb/stm32f1/*.o $(LIBMAPLE_PATH)/build/libmaple/stm32f1/*.o $(LIBMAPLE_PATH)/build/libmaple/usb/usb_lib/*.o $(LIBMAPLE_PATH)/build/libmaple/usb/usb_lib/*.o $(LIBMAPLE_PATH)/build/libmaple/stm32f1/performance/*.o $(LIBMAPLE_PATH)/build/wirish/*.o $(LIBMAPLE_PATH)/build/wirish/boards/maple/*.o $(LIBMAPLE_PATH)/build/wirish/stm32f1/*.o $(LIBMAPLE_PATH)/build/libraries/Wire/*.o COREINCLUDES = -I$(LIBMAPLE_PATH)/libmaple/include/libmaple -I$(LIBMAPLE_PATH)/wirish/include/wirish -I$(LIBMAPLE_PATH)/libraries -I$(LIBMAPLE_PATH)/libmaple/include/libmaple -I$(LIBMAPLE_PATH)/wirish/include/wirish -I$(LIBMAPLE_PATH)/libraries -I$(LIBMAPLE_PATH)/libmaple/include -I$(LIBMAPLE_PATH)/libmaple/stm32f1/include -I$(LIBMAPLE_PATH)/wirish/include -I$(LIBMAPLE_PATH)/wirish/boards/maple/include -I$(LIBMAPLE_PATH)/libraries/Wire @@ -138,7 +132,7 @@ print-%: .PHONY: upload upload: $(SKETCHBIN) - /usr/local/src/flymaple/libmaple/support/scripts/reset.py && sleep 1 && $(UPLOADER) -a1 -d $(USBID) -D $(SKETCHBIN) -R + $(LIBMAPLE_PATH)/support/scripts/reset.py && sleep 1 && $(UPLOADER) -a1 -d $(USBID) -D $(SKETCHBIN) -R debug: $(AVARICE) --mkII --capture --jtag usb :4242 & \