zynq: Resolve offset conflict in SPL QSPI boot

Existing offset for u-boot.img (CONFIG_SYS_SPI_U_BOOT_OFFS)
is 0x100000, which conflicts with the expected offset for uImage. Moving
CONFIG_SYS_SPI_U_BOOT_OFFS to 0x80000 resolves the conflict with minimal
impact and still allows sufficient space for boot.bin and u-boot.img
when using the U-Boot SPL flow.

Signed-off-by: Ezra Savard <ezra.savard@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>

diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h
index 08984a7df70df2a54320e8a1ce8e8b922d29ed38..c028509a59c374bc5d22fd73d50f27693c4728df 100644 (file)
--- a/include/configs/zynq-common.h
+++ b/include/configs/zynq-common.h
@@ -437,7 +437,7 @@
 #define CONFIG_SPL_SPI_LOAD
 #define CONFIG_SPL_SPI_FLASH_SUPPORT
 #define CONFIG_SPL_SPI_BUS     0
-#define CONFIG_SYS_SPI_U_BOOT_OFFS     0x100000
+#define CONFIG_SYS_SPI_U_BOOT_OFFS     0x80000
 #define CONFIG_SPL_SPI_CS      0
 #endif