From: Pavel Pisa <pisa@cmp.felk.cvut.cz>
Date: Fri, 21 Dec 2012 18:04:08 +0000 (+0100)
Subject: LPC21xx: Unify lpc21isp calling for ul_usb1 based boards.
X-Git-Url: https://rtime.felk.cvut.cz/gitweb/sysless.git/commitdiff_plain/9c829550a6a5508338b1ed17691697a1a70a598a

LPC21xx: Unify lpc21isp calling for ul_usb1 based boards.

The updated configurations still defaults to the old lpc21isp
version 1.39 with parameters order adapted for OMK build.

But new version can be used if

  make load-boot LPC21ISP_OLD_PARAM_ORDER=n

is used. Serial port defaults to /dev/ttyUSB0
but alternative can be selected by LPC_TTY=/dev/ttyS0
make variable.

Unconditional switch to the newer version is problematic
because lpc21isp 1.85 seems to not work reliable with
old LPC21xx targets when connected over FTDI.

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

diff --git a/board/arm/ul_usb1/config/config.bell-keypad b/board/arm/ul_usb1/config/config.bell-keypad
index 65b5279..b9d8078 100644
--- a/board/arm/ul_usb1/config/config.bell-keypad
+++ b/board/arm/ul_usb1/config/config.bell-keypad
@@ -23,10 +23,17 @@ TARGET_ARCH = -mcpu=arm7tdmi
 DEBUG ?= -g
 OPTIMIZE ?= -O2
 
+LPC21ISP=lpc21isp
 LPC_BAUD = 38400
-TOLPC = tolpc --baud $(LPC_BAUD) --sdev /dev/ttyS0
-LOAD_CMD-ramisp = $(TOLPC)  -v -q 7372 -L -f 
-LOAD_CMD-boot = lpc21isp -bin /dev/ttyS0 $(LPC_BAUD) 12000
+LPC_TTY = /dev/ttyUSB0
+CPU_SYS_KHZ=12000
+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
 
 # This selects linker script
 LD_SCRIPT=lpc2148
diff --git a/board/arm/ul_usb1/config/config.garage-gate b/board/arm/ul_usb1/config/config.garage-gate
index 2949391..097a830 100644
--- a/board/arm/ul_usb1/config/config.garage-gate
+++ b/board/arm/ul_usb1/config/config.garage-gate
@@ -22,10 +22,22 @@ TARGET_ARCH = -mcpu=arm7tdmi
 DEBUG ?= -g
 OPTIMIZE ?= -O2
 
+LPC21ISP=lpc21isp
 LPC_BAUD = 38400
-TOLPC = tolpc --baud $(LPC_BAUD) --sdev /dev/ttyS0
+LPC_TTY = /dev/ttyUSB0
+CPU_SYS_KHZ=12000
+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
+
+TOLPC = tolpc --baud $(LPC_BAUD) --sdev $(LPC_TTY)
 LOAD_CMD-ramisp = $(TOLPC)  -v -q 7372 -L -f 
-LOAD_CMD-boot = lpc21isp -bin /dev/ttyS0 $(LPC_BAUD) 12000
+
+
 
 # This selects linker script
 LD_SCRIPT=lpc2148
diff --git a/board/arm/ul_usb1/config/config.ha-blinder-ulboot b/board/arm/ul_usb1/config/config.ha-blinder-ulboot
index 06b27fd..9268997 100644
--- a/board/arm/ul_usb1/config/config.ha-blinder-ulboot
+++ b/board/arm/ul_usb1/config/config.ha-blinder-ulboot
@@ -34,10 +34,14 @@ LD_SCRIPT=lpc2105
 
 OUTPUT_FORMATS = hex bin
 
-TOHIT=lpc21isp
-DEV=/dev/ttyUSB0
+LPC21ISP=lpc21isp
+LPC_BAUD = 57600
+LPC_TTY = /dev/ttyUSB0
 CPU_SYS_KHZ=14745
-BAUD=57600
+LPC21ISP_OLD_PARAM_ORDER=y
 
-LOAD_CMD-boot = \
-    $(TOHIT) $(DEV) $(BAUD) $(CPU_SYS_KHZ)
+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
diff --git a/board/arm/ul_usb1/config/config.ha-switch-ulboot b/board/arm/ul_usb1/config/config.ha-switch-ulboot
index bda5aa0..670913e 100644
--- a/board/arm/ul_usb1/config/config.ha-switch-ulboot
+++ b/board/arm/ul_usb1/config/config.ha-switch-ulboot
@@ -32,10 +32,14 @@ LD_SCRIPT=lpc2105
 
 OUTPUT_FORMATS = hex bin
 
-TOHIT=lpc21isp
-DEV=/dev/ttyUSB0
+LPC21ISP=lpc21isp
+LPC_BAUD = 57600
+LPC_TTY = /dev/ttyUSB0
 CPU_SYS_KHZ=14745
-BAUD=57600
+LPC21ISP_OLD_PARAM_ORDER=y
 
-LOAD_CMD-boot = \
-    $(TOHIT) $(DEV) $(BAUD) $(CPU_SYS_KHZ)
+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
diff --git a/board/arm/ul_usb1/config/config.u2jtag b/board/arm/ul_usb1/config/config.u2jtag
index dcb4006..add9809 100644
--- a/board/arm/ul_usb1/config/config.u2jtag
+++ b/board/arm/ul_usb1/config/config.u2jtag
@@ -29,13 +29,17 @@ 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
+LPC21ISP_OLD_PARAM_ORDER=y
 
-LOAD_CMD-boot = \
-    $(TOHIT) $(DEV) $(BAUD) $(CPU_SYS_KHZ)
+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
diff --git a/board/arm/ul_usb1/config/config.u2uv2 b/board/arm/ul_usb1/config/config.u2uv2
index 9f0928a..40d8c7a 100644
--- a/board/arm/ul_usb1/config/config.u2uv2
+++ b/board/arm/ul_usb1/config/config.u2uv2
@@ -32,10 +32,20 @@ TARGET_ARCH = -mcpu=arm7tdmi
 DEBUG ?= -g
 OPTIMIZE ?= -O2
 
+LPC21ISP=lpc21isp
 LPC_BAUD = 38400
-TOLPC = tolpc --baud $(LPC_BAUD) --sdev /dev/ttyS0
+LPC_TTY = /dev/ttyUSB0
+CPU_SYS_KHZ=12000
+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
+
+TOLPC = tolpc --baud $(LPC_BAUD) --sdev $(LPC_TTY)
 LOAD_CMD-ramisp = $(TOLPC)  -v -q 7372 -L -f 
-LOAD_CMD-boot = lpc21isp -bin /dev/ttyUSB0 $(LPC_BAUD) 12000
 
 # This selects linker script
 LD_SCRIPT=lpc2148
@@ -77,4 +87,4 @@ LOAD_CMD-app = \
 RUN_CMD-app = \
      $(USB_SENDHEX) -d $(USB_BOOT_VID) -i $(USB_BOOT_PID) -r
 
-endif
\ No newline at end of file
+endif
diff --git a/board/arm/ul_usb1/config/config.ul_usb1 b/board/arm/ul_usb1/config/config.ul_usb1
index 58c89da..a96d3ba 100644
--- a/board/arm/ul_usb1/config/config.ul_usb1
+++ b/board/arm/ul_usb1/config/config.ul_usb1
@@ -27,10 +27,20 @@ TARGET_ARCH = -mcpu=arm7tdmi
 DEBUG ?= -g
 OPTIMIZE ?= -O2
 
+LPC21ISP=lpc21isp
 LPC_BAUD = 38400
-TOLPC = tolpc --baud $(LPC_BAUD) --sdev /dev/ttyS0
+LPC_TTY = /dev/ttyUSB0
+CPU_SYS_KHZ=12000
+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
+
+TOLPC = tolpc --baud $(LPC_BAUD) --sdev $(LPC_TTY)
 LOAD_CMD-ramisp = $(TOLPC)  -v -q 7372 -L -f 
-LOAD_CMD-boot = lpc21isp -bin /dev/ttyS0 $(LPC_BAUD) 12000
 
 # This selects linker script
 LD_SCRIPT=lpc2148
diff --git a/board/arm/ul_usb1/config/config.ulboot b/board/arm/ul_usb1/config/config.ulboot
index b436c2e..35d376e 100644
--- a/board/arm/ul_usb1/config/config.ulboot
+++ b/board/arm/ul_usb1/config/config.ulboot
@@ -40,10 +40,14 @@ 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
+LPC21ISP_OLD_PARAM_ORDER=y
 
-LOAD_CMD-boot = \
-    $(TOHIT) $(DEV) $(BAUD) $(CPU_SYS_KHZ)
+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