summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2015-10-18 01:41:20 (GMT)
committerMichal Simek <michal.simek@xilinx.com>2015-11-04 13:49:52 (GMT)
commitfa43f69e03e983fbc2ff69c7a5c2e4687605372a (patch)
tree269e4dea63958911fa4d57bfc0dc4d7c1684fe69 /include
parent10172962479ddd6609101fdb83bde66c0719852c (diff)
downloadu-boot-fa43f69e03e983fbc2ff69c7a5c2e4687605372a.tar.xz
arm: zynq: Use separate device tree instead of embedded
Production boards should not use CONFIG_OF_EMBED. Fix this for the Zybo boards. The image to use now becomes u-boot-dtb.bin. For example, the .bif file should contain a line like: [load = 0x04000000,startup=0x04000000]/path/to/u-boot-dtb.bin instead of: [load = 0x04000000,startup=0x04000000]/path/to/u-boot.bin When device tree is enabled we need to load u-boot-dtb.img. Change the settings so that SPL does the right thing. Signed-off-by: Simon Glass <sjg@chromium.org> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Diffstat (limited to 'include')
-rw-r--r--include/configs/zynq-common.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h
index 2d98cd2..f98101f 100644
--- a/include/configs/zynq-common.h
+++ b/include/configs/zynq-common.h
@@ -332,7 +332,11 @@
#define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1
#define CONFIG_SPL_LIBDISK_SUPPORT
#define CONFIG_SPL_FAT_SUPPORT
-#define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img"
+#ifdef CONFIG_OF_CONTROL
+# define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot-dtb.img"
+#else
+# define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img"
+#endif
#endif
/* Disable dcache for SPL just for sure */