[U-Boot] [PATCH] 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 ---
include/configs/zynq-common.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h index f98101fc2730..9f32d6f16268 100644 --- a/include/configs/zynq-common.h +++ b/include/configs/zynq-common.h @@ -332,7 +332,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"

On Mon, Nov 09, 2015 at 10:43:39AM +0100, Michal Simek wrote:
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
participants (2)
-
Michal Simek
-
Tom Rini