From: Andrew F. Davis Date: Tue, 13 Jun 2017 20:04:59 +0000 (-0500) Subject: arm: mach-omap2: Generate MLO file from SD boot capable targets X-Git-Url: http://git.ipfire.org/?p=people%2Fms%2Fu-boot.git;a=commitdiff_plain;h=88024dc5ac1c72c2f3977712d25315eada0ee4d9;hp=31417f0e5abacd754e1d576095e76d0e82327ba7 arm: mach-omap2: Generate MLO file from SD boot capable targets Secure boot targets that can be loaded from an SD card FAT partition need to be called "MLO" on the filesystem, make a copy with this name to clarify the correct image for SD card booting. Signed-off-by: Andrew F. Davis Reviewed-by: Lokesh Vutla --- diff --git a/arch/arm/mach-omap2/config_secure.mk b/arch/arm/mach-omap2/config_secure.mk index 0346cb93ab..c12fbc6ad6 100644 --- a/arch/arm/mach-omap2/config_secure.mk +++ b/arch/arm/mach-omap2/config_secure.mk @@ -67,9 +67,14 @@ u-boot-spl_HS_2ND: $(obj)/u-boot-spl.bin FORCE u-boot-spl_HS_ULO: $(obj)/u-boot-spl.bin FORCE $(call if_changed,mkomapsecimg) -# Standard ISSW target (certain devices, various boot modes) +# Standard ISSW target (certain devices, various boot modes), when copied to +# an SD card FAT partition this file must be called "MLO", we make a copy with +# this name to make this clear u-boot-spl_HS_ISSW: $(obj)/u-boot-spl.bin FORCE $(call if_changed,mkomapsecimg) + @if [ -f $@ ]; then \ + cp -f $@ MLO; \ + fi # For SPI flash on AM335x and AM43xx, these require special byte swap handling # so we use the SPI_X-LOADER target instead of X-LOADER and let the @@ -79,9 +84,13 @@ u-boot-spl_HS_SPI_X-LOADER: $(obj)/u-boot-spl.bin FORCE # For supporting single stage boot on keystone, the image is a full u-boot # file, not an SPL. This will work for all boot devices, other than SPI -# flash +# flash. On Keystone devices when booting from an SD card FAT partition this +# file must be called "MLO" u-boot_HS_MLO: $(obj)/u-boot.bin $(call if_changed,mkomapsecimg) + @if [ -f $@ ]; then \ + cp -f $@ MLO; \ + fi # For supporting single stage XiP QSPI on AM43xx, the image is a full u-boot # file, not an SPL. In this case the mkomapsecimg command looks for a