From: Ezra Savard Date: Tue, 1 Jul 2014 18:48:07 +0000 (-0700) Subject: zynq: Resolve offset conflict in SPL QSPI boot X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e94aa4f5e614330f7e26a56f66b8cb03391c044e;p=thirdparty%2Fu-boot.git 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 Signed-off-by: Michal Simek --- diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h index 08984a7df70..c028509a59c 100644 --- 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