diff options
| author | Simon Glass <sjg@chromium.org> | 2015-10-17 19:41:20 -0600 |
|---|---|---|
| committer | Michal Simek <michal.simek@xilinx.com> | 2015-11-04 14:49:52 +0100 |
| commit | fa43f69e03e983fbc2ff69c7a5c2e4687605372a (patch) | |
| tree | 269e4dea63958911fa4d57bfc0dc4d7c1684fe69 /include/configs/zynq-common.h | |
| parent | 10172962479ddd6609101fdb83bde66c0719852c (diff) | |
| download | blackbird-obmc-uboot-fa43f69e03e983fbc2ff69c7a5c2e4687605372a.tar.gz blackbird-obmc-uboot-fa43f69e03e983fbc2ff69c7a5c2e4687605372a.zip | |
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/configs/zynq-common.h')
| -rw-r--r-- | include/configs/zynq-common.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h index 2d98cd27a9..f98101fc27 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 */ |
