microblaze: Remove XILINX_SPI_FLASH_BASEADDR logic
authorMichal Simek <michal.simek@xilinx.com>
Tue, 17 Jul 2018 12:49:33 +0000 (14:49 +0200)
committerMichal Simek <michal.simek@xilinx.com>
Thu, 19 Jul 2018 08:49:56 +0000 (10:49 +0200)
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 <michal.simek@xilinx.com>
include/configs/microblaze-generic.h

index 5eab2e5..d6a0f5a 100644 (file)
 #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