Cc: Stefano Babic sbabic@denx.de Signed-off-by: Jagan Teki jagan@openedev.com --- configs/apx4devkit_defconfig | 1 + configs/aristainetos2_defconfig | 1 + configs/aristainetos2b_defconfig | 1 + configs/aristainetos_defconfig | 1 + configs/bg0900_defconfig | 1 + configs/cm_fx6_defconfig | 1 + configs/colibri_imx7_defconfig | 1 + configs/gwventana_defconfig | 1 + configs/m28evk_defconfig | 1 + configs/mx28evk_auart_console_defconfig | 1 + configs/mx28evk_defconfig | 1 + configs/mx28evk_nand_defconfig | 1 + configs/mx28evk_spi_defconfig | 1 + configs/mx6dlsabreauto_defconfig | 1 + configs/mx6qpsabreauto_defconfig | 1 + configs/mx6qsabreauto_defconfig | 1 + configs/mx6sxsabreauto_defconfig | 1 + configs/pcm058_defconfig | 1 + configs/platinum_picon_defconfig | 1 + configs/platinum_titanium_defconfig | 1 + configs/titanium_defconfig | 1 + drivers/mtd/nand/Kconfig | 1 - include/configs/aristainetos-common.h | 1 - include/configs/cm_fx6.h | 1 - include/configs/colibri_imx7.h | 1 - include/configs/gw_ventana.h | 1 - include/configs/mx6qsabreauto.h | 1 - include/configs/mx6sxsabreauto.h | 1 - include/configs/mxs.h | 1 - include/configs/pcm058.h | 1 - include/configs/platinum.h | 1 - include/configs/titanium.h | 1 - scripts/config_whitelist.txt | 1 - 33 files changed, 21 insertions(+), 12 deletions(-)
diff --git a/configs/apx4devkit_defconfig b/configs/apx4devkit_defconfig index 9245ebb..dae9dff 100644 --- a/configs/apx4devkit_defconfig +++ b/configs/apx4devkit_defconfig @@ -22,6 +22,7 @@ CONFIG_CMD_CACHE=y CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y CONFIG_CMD_UBI=y +CONFIG_NAND_MXS=y CONFIG_USB=y CONFIG_USB_STORAGE=y CONFIG_OF_LIBFDT=y diff --git a/configs/aristainetos2_defconfig b/configs/aristainetos2_defconfig index 0c0d13e..6d6503c 100644 --- a/configs/aristainetos2_defconfig +++ b/configs/aristainetos2_defconfig @@ -27,6 +27,7 @@ CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_CMD_UBI=y +CONFIG_NAND_MXS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_MTD_UBI_FASTMAP=y diff --git a/configs/aristainetos2b_defconfig b/configs/aristainetos2b_defconfig index 1e725e6..d2c64bb 100644 --- a/configs/aristainetos2b_defconfig +++ b/configs/aristainetos2b_defconfig @@ -27,6 +27,7 @@ CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_CMD_UBI=y +CONFIG_NAND_MXS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_MTD_UBI_FASTMAP=y diff --git a/configs/aristainetos_defconfig b/configs/aristainetos_defconfig index 4a97025..e00a65b 100644 --- a/configs/aristainetos_defconfig +++ b/configs/aristainetos_defconfig @@ -27,6 +27,7 @@ CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_CMD_UBI=y +CONFIG_NAND_MXS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_MTD_UBI_FASTMAP=y diff --git a/configs/bg0900_defconfig b/configs/bg0900_defconfig index 319c3e2..536f7eb 100644 --- a/configs/bg0900_defconfig +++ b/configs/bg0900_defconfig @@ -20,6 +20,7 @@ CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y CONFIG_CMD_CACHE=y +CONFIG_NAND_MXS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_BAR=y CONFIG_SPI_FLASH_STMICRO=y diff --git a/configs/cm_fx6_defconfig b/configs/cm_fx6_defconfig index 9a46d10..b12112d 100644 --- a/configs/cm_fx6_defconfig +++ b/configs/cm_fx6_defconfig @@ -40,6 +40,7 @@ CONFIG_CMD_EXT4=y CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y +CONFIG_NAND_MXS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_ATMEL=y CONFIG_SPI_FLASH_EON=y diff --git a/configs/colibri_imx7_defconfig b/configs/colibri_imx7_defconfig index 341c99d..60dbaa3 100644 --- a/configs/colibri_imx7_defconfig +++ b/configs/colibri_imx7_defconfig @@ -40,6 +40,7 @@ CONFIG_OF_EMBED=y CONFIG_DFU_MMC=y CONFIG_DM_GPIO=y CONFIG_DM_I2C=y +CONFIG_NAND_MXS=y CONFIG_MTD_UBI_FASTMAP=y CONFIG_PINCTRL=y CONFIG_PINCTRL_IMX7=y diff --git a/configs/gwventana_defconfig b/configs/gwventana_defconfig index e27ad44..05f0d19 100644 --- a/configs/gwventana_defconfig +++ b/configs/gwventana_defconfig @@ -45,6 +45,7 @@ CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_CMD_UBI=y CONFIG_DM=y +CONFIG_NAND_MXS=y CONFIG_NETDEVICES=y CONFIG_E1000=y CONFIG_PCI=y diff --git a/configs/m28evk_defconfig b/configs/m28evk_defconfig index f145c40..1437677 100644 --- a/configs/m28evk_defconfig +++ b/configs/m28evk_defconfig @@ -32,6 +32,7 @@ CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_CMD_UBI=y +CONFIG_NAND_MXS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_USB=y diff --git a/configs/mx28evk_auart_console_defconfig b/configs/mx28evk_auart_console_defconfig index 83f4a52..7f566dd 100644 --- a/configs/mx28evk_auart_console_defconfig +++ b/configs/mx28evk_auart_console_defconfig @@ -30,6 +30,7 @@ CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_CMD_UBI=y +CONFIG_NAND_MXS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_SST=y CONFIG_USB=y diff --git a/configs/mx28evk_defconfig b/configs/mx28evk_defconfig index 3bd8de0..bb85b42 100644 --- a/configs/mx28evk_defconfig +++ b/configs/mx28evk_defconfig @@ -31,6 +31,7 @@ CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_CMD_UBI=y +CONFIG_NAND_MXS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_SST=y CONFIG_USB=y diff --git a/configs/mx28evk_nand_defconfig b/configs/mx28evk_nand_defconfig index d511247..f8964a9 100644 --- a/configs/mx28evk_nand_defconfig +++ b/configs/mx28evk_nand_defconfig @@ -30,6 +30,7 @@ CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_CMD_UBI=y +CONFIG_NAND_MXS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_SST=y CONFIG_USB=y diff --git a/configs/mx28evk_spi_defconfig b/configs/mx28evk_spi_defconfig index a3afe14..5b013cf 100644 --- a/configs/mx28evk_spi_defconfig +++ b/configs/mx28evk_spi_defconfig @@ -30,6 +30,7 @@ CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_CMD_UBI=y +CONFIG_NAND_MXS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_SST=y CONFIG_USB=y diff --git a/configs/mx6dlsabreauto_defconfig b/configs/mx6dlsabreauto_defconfig index 45b3fb5..a55ff76 100644 --- a/configs/mx6dlsabreauto_defconfig +++ b/configs/mx6dlsabreauto_defconfig @@ -29,6 +29,7 @@ CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_DFU_MMC=y CONFIG_DFU_SF=y +CONFIG_NAND_MXS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_USB=y diff --git a/configs/mx6qpsabreauto_defconfig b/configs/mx6qpsabreauto_defconfig index 7fcf2d2..1b3a1e2 100644 --- a/configs/mx6qpsabreauto_defconfig +++ b/configs/mx6qpsabreauto_defconfig @@ -28,6 +28,7 @@ CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_DFU_MMC=y CONFIG_DFU_SF=y +CONFIG_NAND_MXS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_USB=y diff --git a/configs/mx6qsabreauto_defconfig b/configs/mx6qsabreauto_defconfig index 7438389..f3ff152 100644 --- a/configs/mx6qsabreauto_defconfig +++ b/configs/mx6qsabreauto_defconfig @@ -29,6 +29,7 @@ CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_DFU_MMC=y CONFIG_DFU_SF=y +CONFIG_NAND_MXS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_USB=y diff --git a/configs/mx6sxsabreauto_defconfig b/configs/mx6sxsabreauto_defconfig index 499c5d9..e5bdb45 100644 --- a/configs/mx6sxsabreauto_defconfig +++ b/configs/mx6sxsabreauto_defconfig @@ -23,6 +23,7 @@ CONFIG_CMD_EXT4=y CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y +CONFIG_NAND_MXS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_BAR=y CONFIG_SPI_FLASH_STMICRO=y diff --git a/configs/pcm058_defconfig b/configs/pcm058_defconfig index b2f70ea..0b9aaa1 100644 --- a/configs/pcm058_defconfig +++ b/configs/pcm058_defconfig @@ -38,6 +38,7 @@ CONFIG_CMD_FS_GENERIC=y CONFIG_CMD_UBI=y CONFIG_DM=y CONFIG_MTD=y +CONFIG_NAND_MXS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_DM_THERMAL=y diff --git a/configs/platinum_picon_defconfig b/configs/platinum_picon_defconfig index 71ebc25..c514654 100644 --- a/configs/platinum_picon_defconfig +++ b/configs/platinum_picon_defconfig @@ -36,6 +36,7 @@ CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_CMD_UBI=y +CONFIG_NAND_MXS=y CONFIG_USB=y CONFIG_USB_STORAGE=y CONFIG_OF_LIBFDT=y diff --git a/configs/platinum_titanium_defconfig b/configs/platinum_titanium_defconfig index 51aeff1..035c33b 100644 --- a/configs/platinum_titanium_defconfig +++ b/configs/platinum_titanium_defconfig @@ -36,6 +36,7 @@ CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_CMD_UBI=y +CONFIG_NAND_MXS=y CONFIG_USB=y CONFIG_USB_STORAGE=y CONFIG_OF_LIBFDT=y diff --git a/configs/titanium_defconfig b/configs/titanium_defconfig index 478eba9..a01d6f4 100644 --- a/configs/titanium_defconfig +++ b/configs/titanium_defconfig @@ -24,6 +24,7 @@ CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_CMD_UBI=y +CONFIG_NAND_MXS=y CONFIG_USB=y CONFIG_USB_STORAGE=y CONFIG_OF_LIBFDT=y diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig index 65bb040..682e4e3 100644 --- a/drivers/mtd/nand/Kconfig +++ b/drivers/mtd/nand/Kconfig @@ -82,7 +82,6 @@ config NAND_ARASAN
config NAND_MXS bool "MXS NAND support" - depends on MX6 help This enables NAND driver for the NAND flash controller on the MXS processors. diff --git a/include/configs/aristainetos-common.h b/include/configs/aristainetos-common.h index 9df6fb0..00dbe45 100644 --- a/include/configs/aristainetos-common.h +++ b/include/configs/aristainetos-common.h @@ -192,7 +192,6 @@ /* NAND stuff */ #define CONFIG_CMD_NAND #define CONFIG_CMD_NAND_TRIMFFS -#define CONFIG_NAND_MXS #define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_SYS_NAND_BASE 0x40000000 #define CONFIG_SYS_NAND_5_ADDR_CYCLE diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h index d39aa4e..c8da830 100644 --- a/include/configs/cm_fx6.h +++ b/include/configs/cm_fx6.h @@ -185,7 +185,6 @@ #define CONFIG_SYS_NAND_BASE 0x40000000 #define CONFIG_SYS_NAND_MAX_CHIPS 1 #define CONFIG_SYS_MAX_NAND_DEVICE 1 -#define CONFIG_NAND_MXS #define CONFIG_SYS_NAND_ONFI_DETECTION /* APBH DMA is required for NAND support */ #define CONFIG_APBH_DMA diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h index bc3b53b..aee853d 100644 --- a/include/configs/colibri_imx7.h +++ b/include/configs/colibri_imx7.h @@ -170,7 +170,6 @@ #define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE #endif
-#define CONFIG_NAND_MXS #define CONFIG_CMD_NAND_TRIMFFS
/* NAND stuff */ diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h index f8500a6..0226465 100644 --- a/include/configs/gw_ventana.h +++ b/include/configs/gw_ventana.h @@ -74,7 +74,6 @@ #define CONFIG_CMD_NAND #define CONFIG_CMD_NAND_TRIMFFS #ifdef CONFIG_CMD_NAND - #define CONFIG_NAND_MXS #define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_SYS_NAND_BASE 0x40000000 #define CONFIG_SYS_NAND_5_ADDR_CYCLE diff --git a/include/configs/mx6qsabreauto.h b/include/configs/mx6qsabreauto.h index f849f34..0c269aa 100644 --- a/include/configs/mx6qsabreauto.h +++ b/include/configs/mx6qsabreauto.h @@ -57,7 +57,6 @@ #define CONFIG_CMD_NAND_TRIMFFS
/* NAND stuff */ -#define CONFIG_NAND_MXS #define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_SYS_NAND_BASE 0x40000000 #define CONFIG_SYS_NAND_5_ADDR_CYCLE diff --git a/include/configs/mx6sxsabreauto.h b/include/configs/mx6sxsabreauto.h index c30e3dd..c35d7e8 100644 --- a/include/configs/mx6sxsabreauto.h +++ b/include/configs/mx6sxsabreauto.h @@ -135,7 +135,6 @@ #define CONFIG_CMD_NAND_TRIMFFS
/* NAND stuff */ -#define CONFIG_NAND_MXS #define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_SYS_NAND_BASE 0x40000000 #define CONFIG_SYS_NAND_5_ADDR_CYCLE diff --git a/include/configs/mxs.h b/include/configs/mxs.h index 04c3ce9..1c613e0 100644 --- a/include/configs/mxs.h +++ b/include/configs/mxs.h @@ -155,7 +155,6 @@
/* NAND */ #ifdef CONFIG_CMD_NAND -#define CONFIG_NAND_MXS #define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_SYS_NAND_BASE 0x60000000 #define CONFIG_SYS_NAND_5_ADDR_CYCLE diff --git a/include/configs/pcm058.h b/include/configs/pcm058.h index 2869c4e..3082d69 100644 --- a/include/configs/pcm058.h +++ b/include/configs/pcm058.h @@ -66,7 +66,6 @@ #define CONFIG_CMD_NAND /* Enable NAND support */ #define CONFIG_CMD_NAND_TRIMFFS -#define CONFIG_NAND_MXS #define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_SYS_NAND_BASE 0x40000000 #define CONFIG_SYS_NAND_5_ADDR_CYCLE diff --git a/include/configs/platinum.h b/include/configs/platinum.h index f3ac458..5f149b0 100644 --- a/include/configs/platinum.h +++ b/include/configs/platinum.h @@ -80,7 +80,6 @@ #ifdef CONFIG_CMD_NAND
/* NAND config */ -#define CONFIG_NAND_MXS #ifndef CONFIG_SYS_NAND_MAX_CHIPS #define CONFIG_SYS_NAND_MAX_CHIPS 2 #endif diff --git a/include/configs/titanium.h b/include/configs/titanium.h index bbdaf04..3ec0ff9 100644 --- a/include/configs/titanium.h +++ b/include/configs/titanium.h @@ -162,7 +162,6 @@ #ifdef CONFIG_CMD_NAND
/* NAND stuff */ -#define CONFIG_NAND_MXS #define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_SYS_NAND_BASE 0x40000000 #define CONFIG_SYS_NAND_5_ADDR_CYCLE diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 1d8124f..16720e5 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -3263,7 +3263,6 @@ CONFIG_NAND_MODE_REG CONFIG_NAND_MPC5121_NFC CONFIG_NAND_MXC CONFIG_NAND_MXC_V1_1 -CONFIG_NAND_MXS CONFIG_NAND_NDFC CONFIG_NAND_OMAP_ECCSCHEME CONFIG_NAND_OMAP_ELM