Make USB loaded image the default variant for usbcan.

Signed-off-by: ppisa <pisa@cmp.felk.cvut.cz>

diff --git a/embedded/app/usbcan/Makefile.omk b/embedded/app/usbcan/Makefile.omk
index edb4a9847244af4fed402eb5b3dcaa06a40bfa4c..7f3e648683ef9ccfd9c11ef8fe7a00441fc19d5b 100644 (file)
--- 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
 
 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
 
 endif #CONFIG_ULBOOT

diff --git a/embedded/board/arm/ul_usb1/config/config.usbcan b/embedded/board/arm/ul_usb1/config/config.usbcan
index b3ee364d8a5c49b20da34a0b6e7d6516721aaf86..e8c9c82e280eeb918b1e403819712f29ef0f0be7 100644 (file)
--- 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) -d $(USB_VID):$(USB_PID) -s $(PROG_BASE) -f binary
 
 RUN_CMD-app = \

-    $(USB_SENDHEX) -r
+    $(USB_SENDHEX) -d $(USB_VID):$(USB_PID) -r