diff options
| author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2016-04-14 06:52:26 +0900 |
|---|---|---|
| committer | Michal Simek <michal.simek@xilinx.com> | 2016-05-24 11:15:00 +0200 |
| commit | 7f307d93ed147fc831425189463d92e50d5c7566 (patch) | |
| tree | 9c9bf46b453166baa3f445f1a3d189315918999f /include/configs/zynq-common.h | |
| parent | d7d000311285e4b8d11e089ca13ea456a01be3b8 (diff) | |
| download | blackbird-obmc-uboot-7f307d93ed147fc831425189463d92e50d5c7566.tar.gz blackbird-obmc-uboot-7f307d93ed147fc831425189463d92e50d5c7566.zip | |
ARM: zynq: load u-boot.img whether CONFIG_OF_SEPARATE is defined or not
Since commit ad1ecd2063da ("fdt: Build a U-Boot binary without device
tree"), u-boot-dtb.img is identical to u-boot.img, so SPL can always
load u-boot.img whether CONFIG_OF_SEPARATE is defined or not.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
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, 1 insertions, 5 deletions
diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h index a3e4aecb57..82ece0df2d 100644 --- a/include/configs/zynq-common.h +++ b/include/configs/zynq-common.h @@ -315,11 +315,7 @@ #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1 #define CONFIG_SPL_LIBDISK_SUPPORT #define CONFIG_SPL_FAT_SUPPORT -#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" -#endif +#define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img" #endif /* Disable dcache for SPL just for sure */ |
