From: Siva Durga Prasad Paladugu Date: Wed, 18 Jan 2017 10:33:26 +0000 (+0530) Subject: zynqmp: Support SPL_SPI_LOAD only if SPL spi flash support present X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=559c218d0faad78b5721a588a741924d5413d4ec;p=thirdparty%2Fu-boot.git zynqmp: Support SPL_SPI_LOAD only if SPL spi flash support present Support SPL_SPI_LOAD only if SPL spi flash support present This fixes the issue of compilation failures on dc1 and dc2. Signed-off-by: Siva Durga Prasad Paladugu Signed-off-by: Michal Simek --- diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h index 7727bda2aaf..5ff51593a21 100644 --- a/include/configs/xilinx_zynqmp.h +++ b/include/configs/xilinx_zynqmp.h @@ -385,12 +385,14 @@ #define CONFIG_SPL_BOARD_INIT #define CONFIG_SPL_RAM_DEVICE -#define CONFIG_SPL_SPI_LOAD -#define CONFIG_SYS_SPI_KERNEL_OFFS 0x80000 -#define CONFIG_SYS_SPI_ARGS_OFFS 0xa0000 -#define CONFIG_SYS_SPI_ARGS_SIZE 0xa0000 +#if defined(CONFIG_SPL_SPI_FLASH_SUPPORT) +# define CONFIG_SPL_SPI_LOAD +# define CONFIG_SYS_SPI_KERNEL_OFFS 0x80000 +# define CONFIG_SYS_SPI_ARGS_OFFS 0xa0000 +# define CONFIG_SYS_SPI_ARGS_SIZE 0xa0000 -#define CONFIG_SYS_SPI_U_BOOT_OFFS 0x140000 +# define CONFIG_SYS_SPI_U_BOOT_OFFS 0x140000 +#endif /* u-boot is like dtb */ #define CONFIG_SPL_FS_LOAD_ARGS_NAME "u-boot.bin"