petalinux: Remove XILINX_PS7_QSPI_FLASH_BASEADDR assignments

petalinux-arm-auto.h assignment is useless.
Do not assing XILINX_PS7_QSPI_FLASH_BASEADDR to XILINX_SPI_FLASH_BASEADDR
because below it is check by if defined().

Signed-off-by: Michal Simek <michal.simek@xilinx.com>

diff --git a/include/configs/petalinux-auto-board.h.template b/include/configs/petalinux-auto-board.h.template
index 17d13f713e530d91fedf44e8e67545d12a861e09..50d7c4b9d609f53ac80c80020c14cc7ee99a038b 100644 (file)
--- a/include/configs/petalinux-auto-board.h.template
+++ b/include/configs/petalinux-auto-board.h.template
@@ -248,12 +248,12 @@
 @ZYNQ_BOOT_DEV@
 #if defined(CONFIG_ZYNQ)
 #if defined(ZYNQ_BOOT_QSPI) && defined(XILINX_PS7_QSPI_FLASH_BASEADDR)
-       #define XILINX_SPI_FLASH_BASEADDR       XILINX_PS7_QSPI_FLASH_BASEADDR
+       #define XILINX_SPI_FLASH_BASEADDR
 #elif defined(ZYNQ_BOOT_SD) && defined(XILINX_PS7_SDIO_BASEADDR)
        #define XILINX_SD_FLASH_BASEADDR        XILINX_PS7_SDIO_BASEADDR
        /* enable other */
        #if  defined(XILINX_PS7_QSPI_FLASH_BASEADDR)
-               #define XILINX_SPI_FLASH_BASEADDR       XILINX_PS7_QSPI_FLASH_BASEADDR
+               #define XILINX_SPI_FLASH_BASEADDR
        #endif
        #if defined(XILINX_PS7_NOR_FLASH_BASEADDR)
                #define XILINX_FLASH_START      XILINX_PS7_NOR_FLASH_BASEADDR

diff --git a/include/configs/petalogix-arm-auto.h b/include/configs/petalogix-arm-auto.h
index f4fa18caddb5c405354a0bc7b957851025983bb3..826babea5505c954827bacc5fff80920fe669042 100644 (file)
--- a/include/configs/petalogix-arm-auto.h
+++ b/include/configs/petalogix-arm-auto.h
@@ -15,7 +15,6 @@
 
 /* Must be removed */
 #if defined(XILINX_PS7_QSPI_FLASH_BASEADDR)
-#define XILINX_SPI_FLASH_BASEADDR      XILINX_PS7_QSPI_FLASH_BASEADDR
 #define XPSS_QSPI_BASEADDR             XILINX_PS7_QSPI_FLASH_BASEADDR
 #endif