From: ppisa Date: Fri, 30 Jan 2009 18:43:31 +0000 (+0100) Subject: Make USB loaded image the default variant for usbcan. X-Git-Url: http://rtime.felk.cvut.cz/gitweb/lincan.git/commitdiff_plain/16f2e763cd09275c174c540c3044eab7cc90e0bc?ds=sidebyside Make USB loaded image the default variant for usbcan. Signed-off-by: ppisa --- diff --git a/embedded/app/usbcan/Makefile.omk b/embedded/app/usbcan/Makefile.omk index edb4a98..7f3e648 100644 --- a/embedded/app/usbcan/Makefile.omk +++ b/embedded/app/usbcan/Makefile.omk @@ -27,6 +27,6 @@ lib_LOADLIBES = bspbase usbbase usbmore lpcusb mach_hal usbcan_MOREOBJS = $(USER_LIB_DIR)/system_stub.o $(USER_LIB_DIR)/ivt.o nobase_include_HEADERS = usb/usb_defs.h -link_VARIANTS = boot app +link_VARIANTS = app boot endif #CONFIG_ULBOOT diff --git a/embedded/board/arm/ul_usb1/config/config.usbcan b/embedded/board/arm/ul_usb1/config/config.usbcan index b3ee364..e8c9c82 100644 --- a/embedded/board/arm/ul_usb1/config/config.usbcan +++ b/embedded/board/arm/ul_usb1/config/config.usbcan @@ -72,4 +72,4 @@ LOAD_CMD-app = \ $(USB_SENDHEX) -d $(USB_VID):$(USB_PID) -s $(PROG_BASE) -f binary RUN_CMD-app = \ - $(USB_SENDHEX) -r + $(USB_SENDHEX) -d $(USB_VID):$(USB_PID) -r