From: Michal Simek Date: Tue, 17 Jul 2018 12:49:33 +0000 (+0200) Subject: microblaze: Remove XILINX_SPI_FLASH_BASEADDR logic X-Git-Url: http://git.dujemihanovic.xyz/?a=commitdiff_plain;h=f4da871a7f09540557792ea5da688c54790add7d;p=u-boot.git microblaze: Remove XILINX_SPI_FLASH_BASEADDR logic XILINX_SPI_FLASH_BASEADDR logic has been converted to DM that's why there is no reason to depend on this address anymore. Signed-off-by: Michal Simek --- diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h index 5eab2e5a38..d6a0f5aa9d 100644 --- a/include/configs/microblaze-generic.h +++ b/include/configs/microblaze-generic.h @@ -19,16 +19,10 @@ #undef SPIFLASH #undef RAMENV /* hold environment in flash */ #else -#ifdef XILINX_SPI_FLASH_BASEADDR -#undef FLASH -#define SPIFLASH -#undef RAMENV /* hold environment in flash */ -#else #undef FLASH #undef SPIFLASH #define RAMENV /* hold environment in RAM */ #endif -#endif /* uart */ /* The following table includes the supported baudrates */ @@ -91,7 +85,6 @@ #else /* !FLASH */ #ifdef SPIFLASH -# define CONFIG_SYS_SPI_BASE XILINX_SPI_FLASH_BASEADDR # define CONFIG_SF_DEFAULT_MODE SPI_MODE_3 # define CONFIG_SF_DEFAULT_SPEED XILINX_SPI_FLASH_MAX_FREQ # define CONFIG_SF_DEFAULT_CS XILINX_SPI_FLASH_CS