update.sh: make set<media>update self contained

'run setupdate' tries a number of update media to find an update script
and then sources it.
Each media is probed by its own run set<media>update, however if a script
is found it is not sourced immediately but this task is delegated to
'run setupdate'. Thus one cannot just do a 'run setethupdate' to only
try to update over Ethernet.

This also unifies the functionality with Colibri VF and Colibri iMX7
were it has been implemented like this for a while now.

While at it use consistently ${loadaddr}.

Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>

6 files changed, 50 insertions, 51 deletions

diff --git a/include/configs/apalis-tk1.h b/include/configs/apalis-tk1.h
index 6a58e823638..d1f6e9db895 100644
--- a/include/configs/apalis-tk1.h
+++ b/include/configs/apalis-tk1.h
@@ -157,21 +157,21 @@
 	NFS_BOOTCMD \
 	SD_BOOTCMD \
 	"setethupdate=if env exists ethaddr; then; else setenv ethaddr " \
-		"00:14:2d:00:00:00; fi; tftpboot ${kernel_addr_r} " \
-		"flash_eth.img\0" \
+		"00:14:2d:00:00:00; fi; tftpboot ${loadaddr} " \
+		"flash_eth.img && source ${loadaddr}\0" \
 	"setsdupdate=setenv interface mmc; setenv drive 1; mmc rescan; " \
-		"load ${interface} ${drive}:1 ${kernel_addr_r} flash_blk.img " \
+		"load ${interface} ${drive}:1 ${loadaddr} flash_blk.img " \
 		"|| setenv drive 2; mmc rescan; load ${interface} ${drive}:1 " \
-		"${kernel_addr_r} flash_blk.img\0" \
+		"${loadaddr} flash_blk.img && " \
+		"source ${loadaddr}\0" \
 	"setup=setenv setupargs igb_mac=${ethaddr} " \
 		"consoleblank=0 no_console_suspend=1 console=tty1 " \
 		"console=${console},${baudrate}n8 debug_uartport=lsport,0 " \
 		"${memargs}\0" \
+	"setupdate=run setsdupdate || run setusbupdate || run setethupdate\0" \
 	"setusbupdate=usb start && setenv interface usb; setenv drive 0; " \
-		"load ${interface} ${drive}:1 ${kernel_addr_r} " \
-		"flash_blk.img\0" \
-	"setupdate=run setsdupdate || run setusbupdate || run setethupdate;" \
-		" source ${kernel_addr_r}\0" \
+		"load ${interface} ${drive}:1 ${loadaddr} flash_blk.img && " \
+		"source ${loadaddr}\0" \
 	USB_BOOTCMD \
 	"vidargs=video=tegrafb0:640x480-16@60 fbcon=map:1\0"
 
diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h
index f83b1ab30da..3ea4a5c38f6 100644
--- a/include/configs/apalis_imx6.h
+++ b/include/configs/apalis_imx6.h
@@ -294,20 +294,20 @@
 	NFS_BOOTCMD \
 	SD_BOOTCMD \
 	"setethupdate=if env exists ethaddr; then; else setenv ethaddr " \
-		"00:14:2d:00:00:00; fi; tftpboot ${kernel_addr_r} " \
-		"flash_eth.img\0" \
+		"00:14:2d:00:00:00; fi; tftpboot ${loadaddr} " \
+		"flash_eth.img && source ${loadaddr}\0" \
 	"setsdupdate=setenv interface mmc; setenv drive 1; mmc rescan; " \
-		"load ${interface} ${drive}:1 ${kernel_addr_r} flash_blk.img " \
-		"|| setenv drive 2; load ${interface} ${drive}:1 " \
-		"${kernel_addr_r} flash_blk.img\0" \
+		"load ${interface} ${drive}:1 ${loadaddr} flash_blk.img " \
+		"|| setenv drive 2; mmc rescan; load ${interface} ${drive}:1 " \
+		"${loadaddr} flash_blk.img && " \
+		"source ${loadaddr}\0" \
 	"setup=setenv setupargs fec_mac=${ethaddr} " \
-		"consoleblank=0  no_console_suspend=1 console=tty1 " \
+		"consoleblank=0 no_console_suspend=1 console=tty1 " \
 		"console=${console},${baudrate}n8\0 " \
-	"setupdate=run setsdupdate || run setusbupdate || run setethupdate;" \
-		" source ${kernel_addr_r}\0" \
+	"setupdate=run setsdupdate || run setusbupdate || run setethupdate\0" \
 	"setusbupdate=usb start && setenv interface usb; setenv drive 0; " \
-		"load ${interface} ${drive}:1 ${kernel_addr_r} " \
-		"flash_blk.img\0" \
+		"load ${interface} ${drive}:1 ${loadaddr} flash_blk.img && " \
+		"source ${loadaddr}\0" \
 	"splashpos=m,m\0" \
 	"vidargs=mxc_hdmi.only_cea=1 " \
 		"video=mxcfb0:dev=hdmi,1920x1080M@60,if=RGB24 " \
diff --git a/include/configs/apalis_t30.h b/include/configs/apalis_t30.h
index c71b72b0413..ffc20237f7a 100644
--- a/include/configs/apalis_t30.h
+++ b/include/configs/apalis_t30.h
@@ -174,21 +174,21 @@
 	NFS_BOOTCMD \
 	SD_BOOTCMD \
 	"setethupdate=if env exists ethaddr; then; else setenv ethaddr " \
-		"00:14:2d:00:00:00; fi; tftpboot ${kernel_addr_r} " \
-		"flash_eth.img\0" \
+		"00:14:2d:00:00:00; fi; tftpboot ${loadaddr} " \
+		"flash_eth.img && source ${loadaddr}\0" \
 	"setsdupdate=setenv interface mmc; setenv drive 1; mmc rescan; " \
-		"load ${interface} ${drive}:1 ${kernel_addr_r} flash_blk.img " \
+		"load ${interface} ${drive}:1 ${loadaddr} flash_blk.img " \
 		"|| setenv drive 2; mmc rescan; load ${interface} ${drive}:1 " \
-		"${kernel_addr_r} flash_blk.img\0" \
+		"${loadaddr} flash_blk.img && " \
+		"source ${loadaddr}\0" \
 	"setup=setenv setupargs igb_mac=${ethaddr} " \
 		"consoleblank=0 no_console_suspend=1 console=tty1 " \
 		"console=${console},${baudrate}n8 debug_uartport=lsport,0 " \
 		"${memargs}\0" \
+	"setupdate=run setsdupdate || run setusbupdate || run setethupdate\0" \
 	"setusbupdate=usb start && setenv interface usb; setenv drive 0; " \
-		"load ${interface} ${drive}:1 ${kernel_addr_r} " \
-		"flash_blk.img\0" \
-	"setupdate=run setsdupdate || run setusbupdate || run setethupdate;" \
-		" source ${kernel_addr_r}\0" \
+		"load ${interface} ${drive}:1 ${loadaddr} flash_blk.img && " \
+		"source ${loadaddr}\0" \
 	USB_BOOTCMD \
 	"vidargs=video=tegrafb0:640x480-16@60 fbcon=map:1\0"
 
diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h
index f33488bd8d9..adc2d1e9c52 100644
--- a/include/configs/colibri_imx6.h
+++ b/include/configs/colibri_imx6.h
@@ -259,18 +259,18 @@
 	NFS_BOOTCMD \
 	SD_BOOTCMD \
 	"setethupdate=if env exists ethaddr; then; else setenv ethaddr " \
-		"00:14:2d:00:00:00; fi; tftpboot ${kernel_addr_r} " \
-		"flash_eth.img\0" \
-	"setsdupdate=setenv interface mmc; setenv drive 1; mmc rescan; " \
-		"load ${interface} ${drive}:1 ${kernel_addr_r} flash_blk.img\0" \
+		"00:14:2d:00:00:00; fi; tftpboot ${loadaddr} " \
+		"flash_eth.img && source ${loadaddr}\0" \
+	"setsdupdate=setenv interface mmc; setenv drive 1; mmc rescan; load " \
+		"${interface} ${drive}:1 ${loadaddr} flash_blk.img && " \
+		"source ${loadaddr}\0" \
 	"setup=setenv setupargs fec_mac=${ethaddr} " \
-		"consoleblank=0  no_console_suspend=1 console=tty1 " \
+		"consoleblank=0 no_console_suspend=1 console=tty1 " \
 		"console=${console},${baudrate}n8\0 " \
-	"setupdate=run setsdupdate || run setusbupdate || run setethupdate;" \
-		" source ${kernel_addr_r}\0" \
+	"setupdate=run setsdupdate || run setusbupdate || run setethupdate\0" \
 	"setusbupdate=usb start && setenv interface usb; setenv drive 0; " \
-		"load ${interface} ${drive}:1 ${kernel_addr_r} " \
-		"flash_blk.img\0" \
+		"load ${interface} ${drive}:1 ${loadaddr} flash_blk.img && " \
+		"source ${loadaddr}\0" \
 	"splashpos=m,m\0" \
 	"vidargs=video=mxcfb0:dev=lcd,640x480M@60,if=RGB666 " \
 		"video=mxcfb1:off fbmem=8M\0 "
diff --git a/include/configs/colibri_t20.h b/include/configs/colibri_t20.h
index 703e20b14d5..36c631cfb38 100644
--- a/include/configs/colibri_t20.h
+++ b/include/configs/colibri_t20.h
@@ -202,20 +202,19 @@
 	NFS_BOOTCMD \
 	SD_BOOTCMD \
 	"setethupdate=if env exists ethaddr; then; else setenv ethaddr " \
-		"00:14:2d:00:00:00; fi; usb start && tftpboot " \
-		"${kernel_addr_r} flash_eth.img\0" \
-	"setsdupdate=setenv interface mmc; setenv drive 0; mmc rescan; " \
-		"load ${interface} ${drive}:1 ${kernel_addr_r} " \
-		"flash_blk.img\0" \
+		"00:14:2d:00:00:00; fi; usb start && tftpboot ${loadaddr} " \
+		"flash_eth.img && source ${loadaddr}\0" \
+	"setsdupdate=setenv interface mmc; setenv drive 0; mmc rescan; load " \
+		"${interface} ${drive}:1 ${loadaddr} flash_blk.img && " \
+		"source ${loadaddr}\0" \
 	"setup=setenv setupargs asix_mac=${ethaddr} " \
 		"consoleblank=0 no_console_suspend=1 console=tty1 " \
 		"console=${console},${baudrate}n8 debug_uartport=lsport,0 " \
 		"${memargs}\0" \
+	"setupdate=run setsdupdate || run setusbupdate || run setethupdate\0" \
 	"setusbupdate=usb start && setenv interface usb; setenv drive 0; " \
-		"load ${interface} ${drive}:1 ${kernel_addr_r} " \
-		"flash_blk.img\0" \
-	"setupdate=run setsdupdate || run setusbupdate || run setethupdate;" \
-		" source ${kernel_addr_r}\0" \
+		"load ${interface} ${drive}:1 ${loadaddr} flash_blk.img && " \
+		"source ${loadaddr}\0" \
 	UBI_BOOTCMD \
 	USB_BOOTCMD \
 	"vidargs=video=tegrafb0:640x480-16@60\0"
diff --git a/include/configs/colibri_t30.h b/include/configs/colibri_t30.h
index 1a36fdae0ef..9498f87d009 100644
--- a/include/configs/colibri_t30.h
+++ b/include/configs/colibri_t30.h
@@ -165,19 +165,19 @@
 	NFS_BOOTCMD \
 	SD_BOOTCMD \
 	"setethupdate=if env exists ethaddr; then; else setenv ethaddr " \
-		"00:14:2d:00:00:00; fi; usb start && tftpboot " \
-		"${kernel_addr_r} flash_eth.img\0" \
+		"00:14:2d:00:00:00; fi; usb start && tftpboot ${loadaddr} " \
+		"flash_eth.img && source ${loadaddr}\0" \
 	"setsdupdate=setenv interface mmc; setenv drive 1; mmc rescan; load " \
-		"${interface} ${drive}:1 ${kernel_addr_r} flash_blk.img\0" \
+		"${interface} ${drive}:1 ${loadaddr} flash_blk.img && " \
+		"source ${loadaddr}\0" \
 	"setup=setenv setupargs asix_mac=${ethaddr} " \
 		"consoleblank=0 no_console_suspend=1 console=tty1 " \
 		"console=${console},${baudrate}n8 debug_uartport=lsport,0 " \
 		"vmalloc=128M mem=1012M@2048M fbmem=12M@3060M\0" \
+	"setupdate=run setsdupdate || run setusbupdate || run setethupdate\0" \
 	"setusbupdate=usb start && setenv interface usb; setenv drive 0; " \
-		"load ${interface} ${drive}:1 ${kernel_addr_r} " \
-		"flash_blk.img\0" \
-	"setupdate=run setsdupdate || run setusbupdate || run setethupdate;" \
-		" source ${kernel_addr_r}\0" \
+		"load ${interface} ${drive}:1 ${loadaddr} flash_blk.img && " \
+		"source ${loadaddr}\0" \
 	USB_BOOTCMD \
 	"vidargs=video=tegrafb0:640x480-16@60\0"