Message ID | 20240521105000.11376-1-marex@denx.de |
---|---|
State | Accepted |
Commit | 5838b3f751bd28319f8c016f7537a88842e548a6 |
Delegated to: | Fabio Estevam |
Headers | show |
Series | ARM: imx: mx5: Simplify TFTP server layout on MX53 Menlo board | expand |
On Tue, May 21, 2024 at 7:50 AM Marek Vasut <marex@denx.de> wrote: > > From: Olaf Mandel <o.mandel@menlosystems.com> > > 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> Applied, thanks.
diff --git a/configs/m53menlo_defconfig b/configs/m53menlo_defconfig index 7c3f0dc1525..b06a614dde0 100644 --- a/configs/m53menlo_defconfig +++ b/configs/m53menlo_defconfig @@ -71,7 +71,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 1ecbba1b58f..9cf46b2c362 100644 --- 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" \