From: Patrick Bruenn <p.bruenn@beckhoff.com>
Date: Tue, 11 Jul 2017 09:23:21 +0000 (+0200)
Subject: imx: cx9020: try pxe boot, if no vmlinuz on mmc
X-Git-Tag: v2017.09-rc1~190^2~2
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=bc104a706601b576f01c1029e2adbb188a9acf43;p=oweals%2Fu-boot.git

imx: cx9020: try pxe boot, if no vmlinuz on mmc

If no vmlinuz is found on mmc, try to boot from pxe.

Signed-off-by: Patrick Bruenn <p.bruenn@beckhoff.com>
---

diff --git a/configs/mx53cx9020_defconfig b/configs/mx53cx9020_defconfig
index e0c597cbe2..9609647f0b 100644
--- a/configs/mx53cx9020_defconfig
+++ b/configs/mx53cx9020_defconfig
@@ -18,6 +18,7 @@ CONFIG_CMD_EXT2=y
 CONFIG_CMD_EXT4=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_CMD_PXE=y
 CONFIG_OF_CONTROL=y
 CONFIG_FPGA_ALTERA=y
 CONFIG_FPGA_CYCLON2=y
diff --git a/include/configs/mx53cx9020.h b/include/configs/mx53cx9020.h
index b056298d9a..cff1462d00 100644
--- a/include/configs/mx53cx9020.h
+++ b/include/configs/mx53cx9020.h
@@ -67,6 +67,7 @@
 
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	"fdt_addr_r=0x71ff0000\0" \
+	"pxefile_addr_r=0x73000000\0" \
 	"ramdisk_addr_r=0x72000000\0" \
 	"console=ttymxc1,115200\0" \
 	"uenv=/boot/uEnv.txt\0" \
@@ -81,6 +82,7 @@
 		"rootfstype=${mmcrootfstype} " \
 		"${cmdline}\0" \
 	"loadimage=load mmc ${bootpart} ${loadaddr} ${bootdir}/${bootfile}\0" \
+	"loadpxe=dhcp;setenv kernel_addr_r ${loadaddr};pxe get;pxe boot;\0" \
 	"loadrd=load mmc ${bootpart} ${ramdisk_addr_r} ${bootdir}/${rdfile};" \
 		"setenv rdsize ${filesize}\0" \
 	"loadfdt=echo loading ${fdt_path} ...;" \
@@ -130,6 +132,9 @@
 			"echo debug: [${bootargs}] ... ;" \
 			"echo debug: [bootz ${loadaddr} - ${fdt_addr_r}];" \
 			"bootz ${loadaddr} - ${fdt_addr_r}; " \
+		"else " \
+			"echo loading from dhcp ...; " \
+			"run loadpxe; " \
 		"fi;\0"
 
 #define CONFIG_BOOTCOMMAND \