From 5f586e9fa14ba93300eaac473b31b6cc0fee17dd Mon Sep 17 00:00:00 2001 From: Lokesh Vutla Date: Mon, 17 Aug 2015 19:54:50 +0530 Subject: ARM: keystone2: Rename u-boot-nand.gph to MLO NAND boot mode, ROM expects an image with a gp header in the beginning and an 8bytes filled with zeros at the end. The same is true for SD boot on K2G platforms but the file name should be MLO. Renaming u-boot-nand.gph to MLO, so that same image can be used for NAND and SD boots. And also not including all the u-boot only images under CONFIG_SPL_BUILD. Reported-by: Nishanth Menon Reviewed-by: Nishanth Menon Signed-off-by: Lokesh Vutla --- arch/arm/mach-keystone/config.mk | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'arch/arm/mach-keystone') diff --git a/arch/arm/mach-keystone/config.mk b/arch/arm/mach-keystone/config.mk index 3fcda92398..ff2fa68327 100644 --- a/arch/arm/mach-keystone/config.mk +++ b/arch/arm/mach-keystone/config.mk @@ -15,8 +15,10 @@ OBJCOPYFLAGS_u-boot-spi.gph = -I binary -O binary --pad-to=$(CONFIG_SPL_PAD_TO) u-boot-spi.gph: spl/u-boot-spl.gph u-boot.img FORCE $(call if_changed,pad_cat) -MKIMAGEFLAGS_u-boot-nand.gph = -A $(ARCH) -T gpimage -C none \ +ifndef CONFIG_SPL_BUILD +MKIMAGEFLAGS_MLO = -A $(ARCH) -T gpimage -C none \ -a $(CONFIG_SYS_TEXT_BASE) -e $(CONFIG_SYS_TEXT_BASE) -n U-Boot -u-boot-nand.gph: u-boot.bin FORCE +MLO: u-boot.bin FORCE $(call if_changed,mkimage) @dd if=/dev/zero bs=8 count=1 2>/dev/null >> $@ +endif -- cgit v1.2.1