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 65b527905dad0f6db506ecf0168eb1ef4cef36ca..b9d80786c10b0896e4ed57517f6e671a37737f51 100644 (file)
--- 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 2949391000fd48d7190bed0c6cc910d1b80ef3c0..097a830028a1712625a2f2c857e2dae011570877 100644 (file)
--- 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 06b27fde1dbc643870e01636e9477eeae49cd684..9268997d40f312628efad7a91126298ce9b7d187 100644 (file)
--- 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 bda5aa0bd6d3e5a58de4592f37959fbd52b79443..670913e8fb0ac606e988150acae91669d9daf9b6 100644 (file)
--- 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 dcb400643b5e6ba46daf3dd93b14ba2e1bd340cb..add9809c2c3d91aa57caee1d040ae0399e47789d 100644 (file)
--- 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 9f0928a1b3896fab29ba2fc6766c9ea9ec7a2166..40d8c7ae42136996188684149909ed3f9cfa52ce 100644 (file)
--- 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 58c89da0870553729284b0ff77b86b1aa78917e7..a96d3ba5fb72640d486880a27fbd9a24d5a47b6e 100644 (file)
--- 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 b436c2e895b9a170206a8df4fdcfbe6dda94ad67..35d376e3a9d49bc724cb630889d6e0a2a17f5489 100644 (file)
--- 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