LPC21xx: Unify lpc21isp calling for ul_usb1 based boards.

[sysless.git] / board / arm / ul_usb1 / config / config.u2jtag

diff --git a/board/arm/ul_usb1/config/config.u2jtag b/board/arm/ul_usb1/config/config.u2jtag
index 210ea63fd91e50d59c8f50615d0142004e7ab982..add9809c2c3d91aa57caee1d040ae0399e47789d 100644 (file)
--- a/board/arm/ul_usb1/config/config.u2jtag
+++ b/board/arm/ul_usb1/config/config.u2jtag
@@ -8,6 +8,7 @@ CONFIG_APP_U2JTAG=y
 
 CONFIG_USB_BASE=y
 CONFIG_USB_LPCUSB=y
+CONFIG_USB_MORE=y
 CONFIG_JTAG_MSP430=y
 
 CONFIG_STDIO_COM_PORT=0
@@ -28,10 +29,31 @@ LD_SCRIPT=lpc2148
 
 OUTPUT_FORMATS = hex bin
 
-TOHIT=lpc21isp
-DEV=/dev/ttyUSB0
+LPC21ISP=lpc21isp
+LPC_BAUD = 38400
+LPC_TTY = /dev/ttyUSB0
 CPU_SYS_KHZ=12000
-BAUD=38400
-
-LOAD_CMD-boot = \
-    $(TOHIT) $(DEV) $(BAUD) $(CPU_SYS_KHZ)
+LPC21ISP_OLD_PARAM_ORDER=y
+
+ifeq ($(LPC21ISP_OLD_PARAM_ORDER),y)
+LOAD_CMD-boot = $(LPC21ISP) -bin $(LPC_TTY) $(LPC_BAUD) $(CPU_SYS_KHZ)
+else
+LOAD_CMD-boot = load() { $(LPC21ISP) -bin $$1 $(LPC_TTY) $(LPC_BAUD) $(CPU_SYS_KHZ); }; load
+endif
+
+PROG_BASE=0x20000
+PROG_SIZE=0x20000
+
+USB_SENDHEX ?= usb_sendhex
+USB_APP_VID ?= 0xdead
+USB_APP_PID ?= 0x1001
+USB_BOOT_VID ?= 0xdead
+USB_BOOT_PID ?= 0x2263
+
+LOAD_CMD-app = \
+     $(USB_SENDHEX) -d $(USB_APP_VID) -i $(USB_APP_PID) -r ; \
+     $(USB_SENDHEX) -w -d $(USB_BOOT_VID) -i $(USB_BOOT_PID) -s $(PROG_BASE) -l $(PROG_SIZE) -e; sleep 2 ; \
+     $(USB_SENDHEX) -d $(USB_BOOT_VID) -i $(USB_BOOT_PID) -s $(PROG_BASE) -f binary
+
+RUN_CMD-app = \
+     $(USB_SENDHEX) -d $(USB_BOOT_VID) -i $(USB_BOOT_PID) -r