There is a need to differentiate fit images for Zynq and ZynqMP U-Boot. Zynq is going to use u-boot-zynq.img and ZynqMP u-boot-zynqmp.img.
Signed-off-by: Michal Simek michal.simek@xilinx.com ---
include/configs/topic_miami.h | 1 + include/configs/xilinx_zynqmp.h | 2 +- include/configs/zynq-common.h | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/include/configs/topic_miami.h b/include/configs/topic_miami.h index b98656dd4c17..2ff0f694bb69 100644 --- a/include/configs/topic_miami.h +++ b/include/configs/topic_miami.h @@ -24,6 +24,7 @@ #undef CONFIG_SPL_ETH_SUPPORT #undef CONFIG_SPL_MAX_FOOTPRINT #define CONFIG_SPL_MAX_FOOTPRINT CONFIG_SYS_SPI_U_BOOT_OFFS +#undef CONFIG_SPL_FS_LOAD_PAYLOAD_NAME #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img"
/* sspi command isn't useful */ diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h index a1c55a83069e..ddeb24a0af6e 100644 --- a/include/configs/xilinx_zynqmp.h +++ b/include/configs/xilinx_zynqmp.h @@ -235,7 +235,7 @@ # define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR 0 /* unused */ # define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS 0 /* unused */ # define CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR 0 /* unused */ -# define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img" +# define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot-zynqmp.img" #endif
#if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_DFU) diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h index ae08ebf2afc1..c765875ca85d 100644 --- a/include/configs/zynq-common.h +++ b/include/configs/zynq-common.h @@ -277,7 +277,7 @@ /* MMC support */ #ifdef CONFIG_MMC_SDHCI_ZYNQ #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1 -#define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img" +#define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot-zynq.img" #endif
/* Address in RAM where the parameters must be copied by SPL. */