commit 8741c490f9028db16634031fdf86ef3866fc3fc5
author Michal Simek <michal.simek@xilinx.com> Mon Nov 09 10:39:44 2015 +0100
committer Michal Simek <michal.simek@xilinx.com> Thu Nov 19 12:57:48 2015 +0100
tree d02ac88688b4a3c340e53b55ef934dfdbc1cdeea
parent a7bcd4c32a343dd069c9ca508df3ac6635d89e7b

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

diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h
index 99a3d021..f33a3bc 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"