From 8741c490f9028db16634031fdf86ef3866fc3fc5 Mon Sep 17 00:00:00 2001 From: Michal Simek <michal.simek@xilinx.com> Date: Mon, 9 Nov 2015 10:39:44 +0100 Subject: [PATCH] ARM: zynq: Choose boot image based on OF_SEPARATE macro OF_CONTROL is enabled by default for all Zynq boards. The difference between two boot images is done by OF_SEPARATE or OF_EMBED macros. Signed-off-by: Michal Simek <michal.simek@xilinx.com> Reviewed-by: Tom Rini <trini@konsulko.com> --- include/configs/zynq-common.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h index 99a3d021ad..f33a3bcc68 100644 --- a/include/configs/zynq-common.h +++ b/include/configs/zynq-common.h @@ -331,7 +331,7 @@ #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1 #define CONFIG_SPL_LIBDISK_SUPPORT #define CONFIG_SPL_FAT_SUPPORT -#ifdef CONFIG_OF_CONTROL +#ifdef CONFIG_OF_SEPARATE # define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot-dtb.img" #else # define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img" -- 2.39.5