apalis/colibri_imx6/t20/t30/vf: fix automatic ethernet update

Fix automatic Ethernet update in case the configblock or U-Boot
environment is corrupted/missing which results in ethaddr aka the MAC
address not being set. Fix this by temporarily using a default Toradex
OUI only based MAC address.

6 files changed, 18 insertions, 7 deletions

diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h
index c3be6facad..e7d0d2087e 100644
--- a/include/configs/apalis_imx6.h
+++ b/include/configs/apalis_imx6.h
@@ -291,7 +291,9 @@
 	MEM_LAYOUT_ENV_SETTINGS \
 	NFS_BOOTCMD \
 	SD_BOOTCMD \
-	"setethupdate=tftpboot ${kernel_addr_r} flash_eth.img\0" \
+	"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 " \
 		"|| setenv drive 2; load ${interface} ${drive}:1 " \
diff --git a/include/configs/apalis_t30.h b/include/configs/apalis_t30.h
index d5380fc8de..bf734ebbb7 100644
--- a/include/configs/apalis_t30.h
+++ b/include/configs/apalis_t30.h
@@ -172,7 +172,9 @@
 	"fdt_board=eval\0" \
 	NFS_BOOTCMD \
 	SD_BOOTCMD \
-	"setethupdate=tftpboot ${kernel_addr_r} flash_eth.img\0" \
+	"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 " \
 		"|| setenv drive 2; mmc rescan; load ${interface} ${drive}:1 " \
diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h
index 3842cd00ef..c545334275 100644
--- a/include/configs/colibri_imx6.h
+++ b/include/configs/colibri_imx6.h
@@ -255,7 +255,9 @@
 	MEM_LAYOUT_ENV_SETTINGS \
 	NFS_BOOTCMD \
 	SD_BOOTCMD \
-	"setethupdate=tftpboot ${kernel_addr_r} flash_eth.img\0" \
+	"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" \
 	"setup=setenv setupargs fec_mac=${ethaddr} " \
diff --git a/include/configs/colibri_t20.h b/include/configs/colibri_t20.h
index 7640ae608c..694c9278d8 100644
--- a/include/configs/colibri_t20.h
+++ b/include/configs/colibri_t20.h
@@ -199,7 +199,9 @@
 	"mtdparts=" MTDPARTS_DEFAULT "\0" \
 	NFS_BOOTCMD \
 	SD_BOOTCMD \
-	"setethupdate=usb start && tftpboot ${kernel_addr_r} flash_eth.img\0" \
+	"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" \
diff --git a/include/configs/colibri_t30.h b/include/configs/colibri_t30.h
index b268b84a5a..1a36fdae0e 100644
--- a/include/configs/colibri_t30.h
+++ b/include/configs/colibri_t30.h
@@ -164,7 +164,9 @@
 	"fdt_board=eval-v3\0" \
 	NFS_BOOTCMD \
 	SD_BOOTCMD \
-	"setethupdate=usb start && tftpboot ${kernel_addr_r} flash_eth.img\0" \
+	"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 1; mmc rescan; load " \
 		"${interface} ${drive}:1 ${kernel_addr_r} flash_blk.img\0" \
 	"setup=setenv setupargs asix_mac=${ethaddr} " \
diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h
index 7ff25c943d..b28394c9d1 100644
--- a/include/configs/colibri_vf.h
+++ b/include/configs/colibri_vf.h
@@ -193,8 +193,9 @@
 	"mtdparts=" MTDPARTS_DEFAULT "\0" \
 	NFS_BOOTCMD \
 	SD_BOOTCMD \
-	"setethupdate=tftpboot ${loadaddr} flash_eth.img && " \
-		"source ${loadaddr}\0" \
+	"setethupdate=if env exists ethaddr; then; else setenv ethaddr " \
+		"00:14:2d:00:00:00; fi; tftpboot ${loadaddr} " \
+		"flash_eth.img && source ${loadaddr}\0" \
 	"setsdupdate=mmc rescan && setenv interface mmc && " \
 		"fatload ${interface} 0:1 ${loadaddr} flash_blk.img && " \
 		"source ${loadaddr}\0" \