From: Masahiro Yamada Date: Wed, 13 Apr 2016 21:52:26 +0000 (+0900) Subject: ARM: zynq: load u-boot.img whether CONFIG_OF_SEPARATE is defined or not X-Git-Tag: v2016.07-rc1~175^2~29 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=7f307d93ed147fc831425189463d92e50d5c7566;p=oweals%2Fu-boot.git 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 Signed-off-by: Michal Simek --- 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 */