From: Michal Simek Date: Tue, 10 Mar 2015 13:01:37 +0000 (+0100) Subject: nand: Rename nand ZYNQMP config string to Arasan one X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c8ae5219c33907b274321fdfb4554c9986297ff5;p=thirdparty%2Fu-boot.git nand: Rename nand ZYNQMP config string to Arasan one Just to be align with others drivers. Signed-off-by: Michal Simek --- diff --git a/drivers/mtd/nand/Makefile b/drivers/mtd/nand/Makefile index 94c50a98afa..3afab7acbd9 100644 --- a/drivers/mtd/nand/Makefile +++ b/drivers/mtd/nand/Makefile @@ -41,6 +41,7 @@ ifdef NORMAL_DRIVERS obj-$(CONFIG_NAND_ECC_BCH) += nand_bch.o obj-$(CONFIG_NAND_ATMEL) += atmel_nand.o +obj-$(CONFIG_NAND_ARASAN) += arasan_nfc.o obj-$(CONFIG_DRIVER_NAND_BFIN) += bfin_nand.o obj-$(CONFIG_NAND_DAVINCI) += davinci_nand.o obj-$(CONFIG_NAND_DENALI) += denali.o @@ -66,7 +67,6 @@ obj-$(CONFIG_NAND_OMAP_ELM) += omap_elm.o obj-$(CONFIG_NAND_PLAT) += nand_plat.o obj-$(CONFIG_NAND_DOCG4) += docg4.o obj-$(CONFIG_NAND_ZYNQ) += zynq_nand.o -obj-$(CONFIG_NAND_ZYNQMP) += arasan_nfc.o else # minimal SPL drivers diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h index 30912a3eca5..52b09a3d626 100644 --- a/include/configs/xilinx_zynqmp.h +++ b/include/configs/xilinx_zynqmp.h @@ -60,7 +60,7 @@ #define CONFIG_ZYNQMP_QSPI #define CONFIG_ZYNQ_SDHCI0 -#define CONFIG_NAND_ZYNQMP +#define CONFIG_NAND_ARASAN #define CONFIG_CONS_INDEX 0 #define CONFIG_BAUDRATE 115200 @@ -101,7 +101,7 @@ #endif /* NAND */ -#ifdef CONFIG_NAND_ZYNQMP +#ifdef CONFIG_NAND_ARASAN # define CONFIG_CMD_NAND # define CONFIG_CMD_NAND_LOCK_UNLOCK # define CONFIG_SYS_MAX_NAND_DEVICE 1