From 61000298442e356dbc76da812b1aa33d9a11e0b4 Mon Sep 17 00:00:00 2001 From: Jagannadha Sutradharudu Teki Date: Wed, 17 Jul 2013 22:25:49 +0530 Subject: [PATCH] spi: zynq_qspi: Rename CONFIG_ZYNQ_SPI to CONFIG_ZYNQ_QSPI As zynq_qspi.c is qspi controller driver, hence renamed CONFIG_ZYNQ_SPI => CONFIG_ZYNQ_QSPI Signed-off-by: Jagannadha Sutradharudu Teki Signed-off-by: Michal Simek --- drivers/spi/Makefile | 2 +- include/configs/petalinux-auto-board.h.template | 2 +- include/configs/zynq_afx.h | 2 +- include/configs/zynq_common.h | 4 ++-- include/configs/zynq_zc70x.h | 2 +- include/configs/zynq_zc770.h | 4 ++-- include/configs/zynq_zed.h | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/spi/Makefile b/drivers/spi/Makefile index 0893c1b5422..866d7558fe8 100644 --- a/drivers/spi/Makefile +++ b/drivers/spi/Makefile @@ -55,7 +55,7 @@ COBJS-$(CONFIG_TEGRA20_SFLASH) += tegra20_sflash.o COBJS-$(CONFIG_TEGRA20_SLINK) += tegra20_slink.o COBJS-$(CONFIG_TEGRA114_SPI) += tegra114_spi.o COBJS-$(CONFIG_XILINX_SPI) += xilinx_spi.o -COBJS-$(CONFIG_ZYNQ_SPI) += zynq_qspi.o +COBJS-$(CONFIG_ZYNQ_QSPI) += zynq_qspi.o COBJS := $(COBJS-y) SRCS := $(COBJS:.o=.c) diff --git a/include/configs/petalinux-auto-board.h.template b/include/configs/petalinux-auto-board.h.template index 56aa15eadbb..4464cf91bea 100644 --- a/include/configs/petalinux-auto-board.h.template +++ b/include/configs/petalinux-auto-board.h.template @@ -309,7 +309,7 @@ #define CONFIG_ENV_SIZE @besize@ #elif defined(XILINX_SPI_FLASH_BASEADDR) /* SPI Flash */ #if defined(XILINX_PS7_QSPI_FLASH_BASEADDR) - #define CONFIG_ZYNQ_SPI + #define CONFIG_ZYNQ_QSPI #define CONFIG_CMD_SPI #define CONFIG_ENV_SPI_MAX_HZ XILINX_SPI_FLASH_MAX_FREQ #define CONFIG_SF_DEFAULT_SPEED XILINX_SPI_FLASH_MAX_FREQ diff --git a/include/configs/zynq_afx.h b/include/configs/zynq_afx.h index 7339fbc552b..fe88cdf64dc 100644 --- a/include/configs/zynq_afx.h +++ b/include/configs/zynq_afx.h @@ -26,7 +26,7 @@ #if defined(CONFIG_AFX_NOR) # undef CONFIG_SYS_NO_FLASH #elif defined(CONFIG_AFX_QSPI) -# define CONFIG_ZYNQ_SPI +# define CONFIG_ZYNQ_QSPI #elif defined(CONFIG_AFX_NAND) # define CONFIG_NAND_ZYNQ #endif diff --git a/include/configs/zynq_common.h b/include/configs/zynq_common.h index 75b381c00e9..97a8f7bc9c9 100644 --- a/include/configs/zynq_common.h +++ b/include/configs/zynq_common.h @@ -121,7 +121,7 @@ #endif /* QSPI */ -#ifdef CONFIG_ZYNQ_SPI +#ifdef CONFIG_ZYNQ_QSPI # define CONFIG_SF_DEFAULT_SPEED 30000000 # define CONFIG_SPI_FLASH # define CONFIG_SPI_FLASH_SPANSION @@ -177,7 +177,7 @@ # ifndef CONFIG_SYS_NO_FLASH /* Environment in NOR flash */ # define CONFIG_ENV_IS_IN_FLASH -# elif defined(CONFIG_ZYNQ_SPI) +# elif defined(CONFIG_ZYNQ_QSPI) /* Environment in Serial Flash */ # define CONFIG_ENV_IS_IN_SPI_FLASH # elif defined(CONFIG_NAND_ZYNQ) diff --git a/include/configs/zynq_zc70x.h b/include/configs/zynq_zc70x.h index 8fe3af23d84..37c48066d91 100644 --- a/include/configs/zynq_zc70x.h +++ b/include/configs/zynq_zc70x.h @@ -27,7 +27,7 @@ #define CONFIG_SYS_NO_FLASH #define CONFIG_ZYNQ_SDHCI0 -#define CONFIG_ZYNQ_SPI +#define CONFIG_ZYNQ_QSPI #define CONFIG_ZYNQ_I2C #define CONFIG_ZYNQ_EEPROM diff --git a/include/configs/zynq_zc770.h b/include/configs/zynq_zc770.h index 0e27a438fe1..190781f02a4 100644 --- a/include/configs/zynq_zc770.h +++ b/include/configs/zynq_zc770.h @@ -27,7 +27,7 @@ # define CONFIG_ZYNQ_GEM0 # define CONFIG_ZYNQ_GEM_PHY_ADDR0 7 # define CONFIG_ZYNQ_SDHCI0 -# define CONFIG_ZYNQ_SPI +# define CONFIG_ZYNQ_QSPI #elif defined(CONFIG_ZC770_XM011) # define CONFIG_ZYNQ_SERIAL_UART1 @@ -41,7 +41,7 @@ # define CONFIG_ZYNQ_SERIAL_UART0 # define CONFIG_ZYNQ_GEM1 # define CONFIG_ZYNQ_GEM_PHY_ADDR1 7 -# define CONFIG_ZYNQ_SPI +# define CONFIG_ZYNQ_QSPI #else # define CONFIG_ZYNQ_SERIAL_UART0 diff --git a/include/configs/zynq_zed.h b/include/configs/zynq_zed.h index 506b0ab0250..c0b7922c2d8 100644 --- a/include/configs/zynq_zed.h +++ b/include/configs/zynq_zed.h @@ -27,7 +27,7 @@ #define CONFIG_SYS_NO_FLASH #define CONFIG_ZYNQ_SDHCI0 -#define CONFIG_ZYNQ_SPI +#define CONFIG_ZYNQ_QSPI #include -- 2.47.3