From: Patrick Bruenn p.bruenn@beckhoff.com

Replace fdtaddr and rdaddr variable names with u-boot standard names fdt_addr_r and ramdisk_addr_r. This will make the use of pxe boot more easy.

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

include/configs/mx53cx9020.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/include/configs/mx53cx9020.h b/include/configs/mx53cx9020.h index 151c4b3faf..b056298d9a 100644 --- a/include/configs/mx53cx9020.h +++ b/include/configs/mx53cx9020.h @@ -66,8 +66,8 @@ #define CONFIG_SYS_TEXT_BASE 0x77800000

#define CONFIG_EXTRA_ENV_SETTINGS \ - "fdt_addr=0x71ff0000\0" \ - "rdaddr=0x72000000\0" \ + "fdt_addr_r=0x71ff0000\0" \ + "ramdisk_addr_r=0x72000000\0" \ "console=ttymxc1,115200\0" \ "uenv=/boot/uEnv.txt\0" \ "optargs=\0" \ @@ -81,10 +81,10 @@ "rootfstype=${mmcrootfstype} " \ "${cmdline}\0" \ "loadimage=load mmc ${bootpart} ${loadaddr} ${bootdir}/${bootfile}\0" \ - "loadrd=load mmc ${bootpart} ${rdaddr} ${bootdir}/${rdfile};" \ + "loadrd=load mmc ${bootpart} ${ramdisk_addr_r} ${bootdir}/${rdfile};" \ "setenv rdsize ${filesize}\0" \ "loadfdt=echo loading ${fdt_path} ...;" \ - "load mmc ${bootpart} ${fdt_addr} ${fdt_path}\0" \ + "load mmc ${bootpart} ${fdt_addr_r} ${fdt_path}\0" \ "mmcboot=mmc dev ${mmcdev}; " \ "if mmc rescan; then " \ "echo SD/MMC found on device ${mmcdev};" \ @@ -128,8 +128,8 @@ "fi;" \ "run mmcargs;" \ "echo debug: [${bootargs}] ... ;" \ - "echo debug: [bootz ${loadaddr} - ${fdt_addr}] ... ;" \ - "bootz ${loadaddr} - ${fdt_addr}; " \ + "echo debug: [bootz ${loadaddr} - ${fdt_addr_r}];" \ + "bootz ${loadaddr} - ${fdt_addr_r}; " \ "fi;\0"

#define CONFIG_BOOTCOMMAND \

From: Patrick Bruenn p.bruenn@beckhoff.com

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

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

---

configs/mx53cx9020_defconfig | 1 + include/configs/mx53cx9020.h | 5 +++++ 2 files changed, 6 insertions(+)

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 \