summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Simek <michal.simek@xilinx.com>2015-11-09 10:39:44 +0100
committerMichal Simek <michal.simek@xilinx.com>2015-11-19 12:57:48 +0100
commit8741c490f9028db16634031fdf86ef3866fc3fc5 (patch)
treed02ac88688b4a3c340e53b55ef934dfdbc1cdeea
parenta7bcd4c32a343dd069c9ca508df3ac6635d89e7b (diff)
downloadu-boot-imx-8741c490f9028db16634031fdf86ef3866fc3fc5.zip
u-boot-imx-8741c490f9028db16634031fdf86ef3866fc3fc5.tar.gz
u-boot-imx-8741c490f9028db16634031fdf86ef3866fc3fc5.tar.bz2
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>
-rw-r--r--include/configs/zynq-common.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h
index 99a3d02..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"