diff options
author | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2015-10-30 09:29:07 +0100 |
---|---|---|
committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2015-10-30 21:09:07 +0100 |
commit | ece432de370327c85b0cedf75965dc94d2d1c945 (patch) | |
tree | d8fc908a79b3b88c5362959f0235479157774333 /include | |
parent | de00d9ecaab2a1c8aacf52a164053d729ba2ee06 (diff) |
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.
Diffstat (limited to 'include')
-rw-r--r-- | include/configs/apalis_imx6.h | 4 | ||||
-rw-r--r-- | include/configs/apalis_t30.h | 4 | ||||
-rw-r--r-- | include/configs/colibri_imx6.h | 4 | ||||
-rw-r--r-- | include/configs/colibri_t20.h | 4 | ||||
-rw-r--r-- | include/configs/colibri_t30.h | 4 | ||||
-rw-r--r-- | include/configs/colibri_vf.h | 5 |
6 files changed, 18 insertions, 7 deletions
diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h index c3be6facadb..e7d0d2087e0 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 d5380fc8de5..bf734ebbb7d 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 3842cd00ef4..c545334275b 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 7640ae608c1..694c9278d82 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 b268b84a5ac..1a36fdae0ef 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 7ff25c943dc..b28394c9d14 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" \ |