ARM: imx: mx5: Simplify TFTP server layout on MX53 Menlo board

By removing the "boot" directory in the "m53menlo/boot/fitImage" path,
we simplify the TFTP server directory layout a bit. This also requires a
change to the mmcload command as it (mis-)uses the same variable as the
TFTP boot.

Signed-off-by: Olaf Mandel <o.mandel@menlosystems.com>
Signed-off-by: Marek Vasut <marex@denx.de>

diff --git a/configs/m53menlo_defconfig b/configs/m53menlo_defconfig
index 67805b14fa0e7d3dd51d94e5f98333fd8b7981cf..db3a5b9f20662a7c41b60247cfe4ef6795b4bb6e 100644 (file)
--- a/configs/m53menlo_defconfig
+++ b/configs/m53menlo_defconfig
@@ -72,7 +72,7 @@ CONFIG_ENV_RANGE=0x80000
 CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_USE_BOOTFILE=y
-CONFIG_BOOTFILE="boot/fitImage"
+CONFIG_BOOTFILE="fitImage"
 CONFIG_USE_ETHPRIME=y
 CONFIG_ETHPRIME="FEC0"
 CONFIG_USE_HOSTNAME=y

diff --git a/include/configs/m53menlo.h b/include/configs/m53menlo.h
index 1ecbba1b58ff867e7c0975d80ae8da37831a6e69..9cf46b2c3624dcdc4a5de3a92801f718d065a646 100644 (file)
--- a/include/configs/m53menlo.h
+++ b/include/configs/m53menlo.h
@@ -119,7 +119,7 @@
        "addargs=run addcons addmisc addmtd\0"                          \
        "mmcload="                                                      \
                "mmc rescan || reset ; load mmc ${mmcdev}:${mmcpart} "  \
-               "${kernel_addr_r} ${bootfile} || reset\0"               \
+               "${kernel_addr_r} boot/${bootfile} || reset\0"          \
        "miscargs=nohlt panic=1\0"                                      \
        "mmcargs=setenv bootargs root=/dev/mmcblk0p${mmcpart} rw "      \
                "rootwait\0"                                            \