From b9f9043296b6d3d2a764a8d53308e51353927653 Mon Sep 17 00:00:00 2001 From: Michal Simek Date: Wed, 1 May 2013 16:02:32 +0200 Subject: [PATCH] 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 --- include/configs/petalinux-auto-board.h.template | 4 ++-- include/configs/petalogix-arm-auto.h | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/include/configs/petalinux-auto-board.h.template b/include/configs/petalinux-auto-board.h.template index 17d13f713e5..50d7c4b9d60 100644 --- 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 f4fa18caddb..826babea550 100644 --- 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 -- 2.47.3