[U-Boot] [PATCH v2 1/6] Convert CONFIG_NAND_MXS to Kconfig
stefan at agner.ch
stefan at agner.ch
Mon Feb 5 21:24:32 UTC 2018
On 02.02.2018 22:44, Stefan Agner wrote:
> From: Stefan Agner <stefan.agner at toradex.com>
>
> This converts CONFIG_NAND_MXS to Kconfig.
>
> Signed-off-by: Stefan Agner <stefan.agner at toradex.com>
> ---
>
> Changes in v2:
> - Extend the patchset with "Convert CONFIG_NAND_MXS to Kconfig" patch
>
> configs/apx4devkit_defconfig | 3 ++-
> configs/aristainetos2_defconfig | 3 ++-
> configs/aristainetos2b_defconfig | 3 ++-
> configs/aristainetos_defconfig | 3 ++-
> configs/cm_fx6_defconfig | 11 ++---------
> configs/colibri_imx7_defconfig | 3 ++-
> configs/gwventana_nand_defconfig | 3 ++-
> configs/m28evk_defconfig | 3 ++-
> configs/mx28evk_auart_console_defconfig | 3 ++-
> configs/mx28evk_defconfig | 3 ++-
> configs/mx28evk_nand_defconfig | 3 ++-
> configs/mx28evk_spi_defconfig | 3 ++-
> configs/mx6sabreauto_defconfig | 3 ++-
> configs/mx6sxsabreauto_defconfig | 3 ++-
> configs/pcm058_defconfig | 3 ++-
> configs/pfla02_defconfig | 3 +++
> configs/platinum_picon_defconfig | 3 ++-
> configs/platinum_titanium_defconfig | 3 ++-
> configs/titanium_defconfig | 3 ++-
> include/configs/aristainetos-common.h | 1 -
> include/configs/cm_fx6.h | 1 -
> include/configs/colibri_imx7.h | 2 --
> include/configs/gw_ventana.h | 1 -
> include/configs/mx6sabreauto.h | 1 -
> include/configs/mx6sxsabreauto.h | 1 -
> include/configs/mxs.h | 1 -
> include/configs/pcm058.h | 1 -
> include/configs/pfla02.h | 1 -
> include/configs/platinum.h | 1 -
> include/configs/titanium.h | 1 -
> 30 files changed, 39 insertions(+), 38 deletions(-)
>
> diff --git a/configs/apx4devkit_defconfig b/configs/apx4devkit_defconfig
> index 47a4ee9e26..cc6da42066 100644
> --- a/configs/apx4devkit_defconfig
> +++ b/configs/apx4devkit_defconfig
> @@ -13,7 +13,6 @@ CONFIG_SPL=y
> CONFIG_HUSH_PARSER=y
> # CONFIG_CMD_FLASH is not set
> CONFIG_CMD_MMC=y
> -CONFIG_CMD_NAND=y
> CONFIG_CMD_USB=y
> # CONFIG_CMD_SETEXPR is not set
> CONFIG_CMD_DHCP=y
> @@ -27,6 +26,8 @@
> CONFIG_MTDPARTS_DEFAULT="mtdparts=gpmi-nand:128k(bootstrap),1024k(boot),768k(env
> CONFIG_CMD_UBI=y
> CONFIG_ENV_IS_IN_NAND=y
> CONFIG_MMC_MXS=y
> +CONFIG_NAND=y
> +CONFIG_NAND_MXS=y
This needs NAND_MXS to be selectable for MX23/28 architectures, however
with the current Kconfig this is not possible. I have a patchset ready
which converts MX23/28 to Kconfig.. I will move this patch ontop of that
patchset, and send a v3 for the driver related changes.
--
Stefan
> CONFIG_USB=y
> CONFIG_USB_EHCI_HCD=y
> CONFIG_USB_STORAGE=y
> diff --git a/configs/aristainetos2_defconfig b/configs/aristainetos2_defconfig
> index 288dab0d3c..c0daed6b22 100644
> --- a/configs/aristainetos2_defconfig
> +++ b/configs/aristainetos2_defconfig
> @@ -14,7 +14,6 @@ CONFIG_CMD_BOOTZ=y
> CONFIG_CMD_GPIO=y
> CONFIG_CMD_I2C=y
> CONFIG_CMD_MMC=y
> -CONFIG_CMD_NAND=y
> CONFIG_CMD_NAND_TRIMFFS=y
> CONFIG_CMD_SF=y
> CONFIG_CMD_USB=y
> @@ -31,6 +30,8 @@ CONFIG_CMD_FAT=y
> CONFIG_CMD_FS_GENERIC=y
> CONFIG_CMD_UBI=y
> CONFIG_ENV_IS_IN_SPI_FLASH=y
> +CONFIG_NAND=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 115ae07ad6..fbb2c1c38d 100644
> --- a/configs/aristainetos2b_defconfig
> +++ b/configs/aristainetos2b_defconfig
> @@ -14,7 +14,6 @@ CONFIG_CMD_BOOTZ=y
> CONFIG_CMD_GPIO=y
> CONFIG_CMD_I2C=y
> CONFIG_CMD_MMC=y
> -CONFIG_CMD_NAND=y
> CONFIG_CMD_NAND_TRIMFFS=y
> CONFIG_CMD_SF=y
> CONFIG_CMD_USB=y
> @@ -31,6 +30,8 @@ CONFIG_CMD_FAT=y
> CONFIG_CMD_FS_GENERIC=y
> CONFIG_CMD_UBI=y
> CONFIG_ENV_IS_IN_SPI_FLASH=y
> +CONFIG_NAND=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 cad8b4af8a..13f4d6eb52 100644
> --- a/configs/aristainetos_defconfig
> +++ b/configs/aristainetos_defconfig
> @@ -14,7 +14,6 @@ CONFIG_CMD_BOOTZ=y
> CONFIG_CMD_GPIO=y
> CONFIG_CMD_I2C=y
> CONFIG_CMD_MMC=y
> -CONFIG_CMD_NAND=y
> CONFIG_CMD_NAND_TRIMFFS=y
> CONFIG_CMD_SF=y
> CONFIG_CMD_USB=y
> @@ -31,6 +30,8 @@ CONFIG_CMD_FAT=y
> CONFIG_CMD_FS_GENERIC=y
> CONFIG_CMD_UBI=y
> CONFIG_ENV_IS_IN_SPI_FLASH=y
> +CONFIG_NAND=y
> +CONFIG_NAND_MXS=y
> CONFIG_SPI_FLASH=y
> CONFIG_SPI_FLASH_STMICRO=y
> CONFIG_MTD_UBI_FASTMAP=y
> diff --git a/configs/cm_fx6_defconfig b/configs/cm_fx6_defconfig
> index 6b1c0a823c..995baabd5d 100644
> --- a/configs/cm_fx6_defconfig
> +++ b/configs/cm_fx6_defconfig
> @@ -20,9 +20,7 @@ CONFIG_BOOTCOMMAND="run findfdt; run distro_bootcmd;
> run legacy_bootcmd"
> CONFIG_SPL=y
> CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x80
> CONFIG_SPL_I2C_SUPPORT=y
> -CONFIG_HUSH_PARSER=y
> CONFIG_SYS_PROMPT="CM-FX6 # "
> -CONFIG_CMD_BOOTZ=y
> # CONFIG_CMD_XIMG is not set
> CONFIG_CMD_GREPENV=y
> CONFIG_CMD_EEPROM=y
> @@ -35,20 +33,13 @@ CONFIG_CMD_I2C=y
> # CONFIG_CMD_LOADB is not set
> # CONFIG_CMD_LOADS is not set
> CONFIG_CMD_MMC=y
> -CONFIG_CMD_NAND=y
> CONFIG_CMD_SATA=y
> CONFIG_CMD_SF=y
> CONFIG_CMD_USB=y
> # CONFIG_CMD_SETEXPR is not set
> -CONFIG_CMD_DHCP=y
> -CONFIG_CMD_PING=y
> CONFIG_CMD_BMP=y
> CONFIG_CMD_CACHE=y
> -CONFIG_CMD_EXT2=y
> -CONFIG_CMD_EXT4=y
> CONFIG_CMD_EXT4_WRITE=y
> -CONFIG_CMD_FAT=y
> -CONFIG_CMD_FS_GENERIC=y
> CONFIG_CMD_MTDPARTS=y
> CONFIG_MTDIDS_DEFAULT="nor0=spi0.0"
>
> CONFIG_MTDPARTS_DEFAULT="mtdparts=spi0.0:768k(uboot),256k(uboot-environment),-(reserved)"
> @@ -57,6 +48,8 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y
> CONFIG_DWC_AHSATA=y
> CONFIG_DM_KEYBOARD=y
> CONFIG_DM_MMC=y
> +CONFIG_NAND=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 efc4ccb0f6..7880f7733b 100644
> --- a/configs/colibri_imx7_defconfig
> +++ b/configs/colibri_imx7_defconfig
> @@ -23,7 +23,6 @@ CONFIG_CMD_DFU=y
> CONFIG_CMD_GPIO=y
> CONFIG_CMD_I2C=y
> CONFIG_CMD_MMC=y
> -CONFIG_CMD_NAND=y
> CONFIG_CMD_NAND_TRIMFFS=y
> CONFIG_CMD_NAND_TORTURE=y
> CONFIG_CMD_USB=y
> @@ -45,6 +44,8 @@ CONFIG_ENV_IS_IN_NAND=y
> CONFIG_DFU_MMC=y
> CONFIG_DM_GPIO=y
> CONFIG_DM_I2C=y
> +CONFIG_NAND=y
> +CONFIG_NAND_MXS=y
> CONFIG_MTD_UBI_FASTMAP=y
> CONFIG_PHYLIB=y
> CONFIG_PHY_MICREL=y
> diff --git a/configs/gwventana_nand_defconfig b/configs/gwventana_nand_defconfig
> index be6cf0cbde..fbfd352054 100644
> --- a/configs/gwventana_nand_defconfig
> +++ b/configs/gwventana_nand_defconfig
> @@ -36,7 +36,6 @@ CONFIG_CMD_SPL_WRITE_SIZE=0x20000
> CONFIG_CMD_GPIO=y
> CONFIG_CMD_I2C=y
> CONFIG_CMD_MMC=y
> -CONFIG_CMD_NAND=y
> CONFIG_CMD_NAND_TRIMFFS=y
> CONFIG_CMD_PCI=y
> CONFIG_CMD_USB=y
> @@ -57,6 +56,8 @@ CONFIG_CMD_UBI=y
> CONFIG_ENV_IS_IN_NAND=y
> CONFIG_DM=y
> CONFIG_DWC_AHSATA=y
> +CONFIG_NAND=y
> +CONFIG_NAND_MXS=y
> CONFIG_PHYLIB=y
> CONFIG_NETDEVICES=y
> CONFIG_E1000=y
> diff --git a/configs/m28evk_defconfig b/configs/m28evk_defconfig
> index 3bc6b1835f..77d67a9916 100644
> --- a/configs/m28evk_defconfig
> +++ b/configs/m28evk_defconfig
> @@ -21,7 +21,6 @@ CONFIG_CMD_GREPENV=y
> # CONFIG_CMD_FLASH is not set
> CONFIG_CMD_GPIO=y
> CONFIG_CMD_MMC=y
> -CONFIG_CMD_NAND=y
> CONFIG_CMD_NAND_TRIMFFS=y
> CONFIG_CMD_SF=y
> CONFIG_CMD_SPI=y
> @@ -41,6 +40,8 @@
> CONFIG_MTDPARTS_DEFAULT="mtdparts=gpmi-nand:3m(u-boot),512k(env1),512k(env2),14m
> CONFIG_CMD_UBI=y
> CONFIG_ENV_IS_IN_NAND=y
> CONFIG_MMC_MXS=y
> +CONFIG_NAND=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 c4977564e4..09273333f3 100644
> --- a/configs/mx28evk_auart_console_defconfig
> +++ b/configs/mx28evk_auart_console_defconfig
> @@ -16,7 +16,6 @@ CONFIG_CMD_BOOTZ=y
> # CONFIG_CMD_FLASH is not set
> CONFIG_CMD_GPIO=y
> CONFIG_CMD_MMC=y
> -CONFIG_CMD_NAND=y
> CONFIG_CMD_NAND_TRIMFFS=y
> CONFIG_CMD_SF=y
> CONFIG_CMD_SPI=y
> @@ -36,6 +35,8 @@
> CONFIG_MTDPARTS_DEFAULT="mtdparts=gpmi-nand:3m(bootloader)ro,512k(environment),5
> CONFIG_CMD_UBI=y
> CONFIG_ENV_IS_IN_MMC=y
> CONFIG_MMC_MXS=y
> +CONFIG_NAND=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 40c9df2809..21d01bc8c6 100644
> --- a/configs/mx28evk_defconfig
> +++ b/configs/mx28evk_defconfig
> @@ -16,7 +16,6 @@ CONFIG_CMD_BOOTZ=y
> # CONFIG_CMD_FLASH is not set
> CONFIG_CMD_GPIO=y
> CONFIG_CMD_MMC=y
> -CONFIG_CMD_NAND=y
> CONFIG_CMD_NAND_TRIMFFS=y
> CONFIG_CMD_SF=y
> CONFIG_CMD_SPI=y
> @@ -36,6 +35,8 @@
> CONFIG_MTDPARTS_DEFAULT="mtdparts=gpmi-nand:3m(bootloader)ro,512k(environment),5
> CONFIG_CMD_UBI=y
> CONFIG_ENV_IS_IN_MMC=y
> CONFIG_MMC_MXS=y
> +CONFIG_NAND=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 ea97f401d1..3e4ba39e32 100644
> --- a/configs/mx28evk_nand_defconfig
> +++ b/configs/mx28evk_nand_defconfig
> @@ -15,7 +15,6 @@ CONFIG_CMD_BOOTZ=y
> # CONFIG_CMD_FLASH is not set
> CONFIG_CMD_GPIO=y
> CONFIG_CMD_MMC=y
> -CONFIG_CMD_NAND=y
> CONFIG_CMD_NAND_TRIMFFS=y
> CONFIG_CMD_SF=y
> CONFIG_CMD_SPI=y
> @@ -35,6 +34,8 @@
> CONFIG_MTDPARTS_DEFAULT="mtdparts=gpmi-nand:3m(bootloader)ro,512k(environment),5
> CONFIG_CMD_UBI=y
> CONFIG_ENV_IS_IN_NAND=y
> CONFIG_MMC_MXS=y
> +CONFIG_NAND=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 34e9927c0f..dab5394943 100644
> --- a/configs/mx28evk_spi_defconfig
> +++ b/configs/mx28evk_spi_defconfig
> @@ -15,7 +15,6 @@ CONFIG_CMD_BOOTZ=y
> # CONFIG_CMD_FLASH is not set
> CONFIG_CMD_GPIO=y
> CONFIG_CMD_MMC=y
> -CONFIG_CMD_NAND=y
> CONFIG_CMD_NAND_TRIMFFS=y
> CONFIG_CMD_SF=y
> CONFIG_CMD_SPI=y
> @@ -35,6 +34,8 @@
> CONFIG_MTDPARTS_DEFAULT="mtdparts=gpmi-nand:3m(bootloader)ro,512k(environment),5
> CONFIG_CMD_UBI=y
> CONFIG_ENV_IS_IN_SPI_FLASH=y
> CONFIG_MMC_MXS=y
> +CONFIG_NAND=y
> +CONFIG_NAND_MXS=y
> CONFIG_SPI_FLASH=y
> CONFIG_SPI_FLASH_SST=y
> CONFIG_USB=y
> diff --git a/configs/mx6sabreauto_defconfig b/configs/mx6sabreauto_defconfig
> index 215700bc3f..0a713d5b10 100644
> --- a/configs/mx6sabreauto_defconfig
> +++ b/configs/mx6sabreauto_defconfig
> @@ -23,7 +23,6 @@ CONFIG_CMD_DFU=y
> CONFIG_CMD_GPIO=y
> CONFIG_CMD_I2C=y
> CONFIG_CMD_MMC=y
> -CONFIG_CMD_NAND=y
> CONFIG_CMD_NAND_TRIMFFS=y
> CONFIG_CMD_PART=y
> CONFIG_CMD_SF=y
> @@ -40,6 +39,8 @@ CONFIG_CMD_FS_GENERIC=y
> CONFIG_ENV_IS_IN_MMC=y
> CONFIG_DFU_MMC=y
> CONFIG_DFU_SF=y
> +CONFIG_NAND=y
> +CONFIG_NAND_MXS=y
> CONFIG_SPI_FLASH=y
> CONFIG_SPI_FLASH_STMICRO=y
> CONFIG_PHYLIB=y
> diff --git a/configs/mx6sxsabreauto_defconfig b/configs/mx6sxsabreauto_defconfig
> index a2c4830795..43b6ab9c6c 100644
> --- a/configs/mx6sxsabreauto_defconfig
> +++ b/configs/mx6sxsabreauto_defconfig
> @@ -10,7 +10,6 @@ CONFIG_CMD_BOOTZ=y
> CONFIG_CMD_GPIO=y
> CONFIG_CMD_I2C=y
> CONFIG_CMD_MMC=y
> -CONFIG_CMD_NAND=y
> CONFIG_CMD_NAND_TRIMFFS=y
> CONFIG_CMD_SF=y
> CONFIG_CMD_USB=y
> @@ -31,6 +30,8 @@ CONFIG_DM_GPIO=y
> CONFIG_DM_PCA953X=y
> CONFIG_DM_I2C=y
> CONFIG_DM_MMC=y
> +CONFIG_NAND=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 99713c26b2..daca54dbc3 100644
> --- a/configs/pcm058_defconfig
> +++ b/configs/pcm058_defconfig
> @@ -26,7 +26,6 @@ CONFIG_CMD_BOOTZ=y
> CONFIG_CMD_GPIO=y
> CONFIG_CMD_I2C=y
> CONFIG_CMD_MMC=y
> -CONFIG_CMD_NAND=y
> CONFIG_CMD_NAND_TRIMFFS=y
> CONFIG_CMD_SF=y
> CONFIG_CMD_DHCP=y
> @@ -48,6 +47,8 @@ CONFIG_EFI_PARTITION=y
> CONFIG_ENV_IS_IN_SPI_FLASH=y
> CONFIG_DM=y
> CONFIG_MTD=y
> +CONFIG_NAND=y
> +CONFIG_NAND_MXS=y
> CONFIG_SPI_FLASH=y
> CONFIG_SPI_FLASH_STMICRO=y
> CONFIG_PHYLIB=y
> diff --git a/configs/pfla02_defconfig b/configs/pfla02_defconfig
> index 029c9de2ce..a9daccfd6a 100644
> --- a/configs/pfla02_defconfig
> +++ b/configs/pfla02_defconfig
> @@ -26,6 +26,7 @@ CONFIG_CMD_BOOTZ=y
> CONFIG_CMD_GPIO=y
> CONFIG_CMD_I2C=y
> CONFIG_CMD_MMC=y
> +# CONFIG_CMD_NAND is not set
> CONFIG_CMD_SF=y
> CONFIG_CMD_DHCP=y
> CONFIG_CMD_MII=y
> @@ -45,6 +46,8 @@ CONFIG_EFI_PARTITION=y
> # CONFIG_SPL_PARTITION_UUIDS is not set
> CONFIG_DM=y
> CONFIG_MTD=y
> +CONFIG_NAND=y
> +CONFIG_NAND_MXS=y
> CONFIG_SPI_FLASH=y
> CONFIG_SPI_FLASH_STMICRO=y
> CONFIG_PHYLIB=y
> diff --git a/configs/platinum_picon_defconfig b/configs/platinum_picon_defconfig
> index 54d88b2dc0..c45ce14268 100644
> --- a/configs/platinum_picon_defconfig
> +++ b/configs/platinum_picon_defconfig
> @@ -23,7 +23,6 @@ CONFIG_CMD_BOOTZ=y
> CONFIG_CMD_GPIO=y
> CONFIG_CMD_I2C=y
> CONFIG_CMD_MMC=y
> -CONFIG_CMD_NAND=y
> CONFIG_CMD_NAND_TRIMFFS=y
> CONFIG_CMD_USB=y
> # CONFIG_CMD_SETEXPR is not set
> @@ -41,6 +40,8 @@ CONFIG_MTDIDS_DEFAULT="nand0=gpmi-nand"
>
> CONFIG_MTDPARTS_DEFAULT="mtdparts=gpmi-nand:14M(spl),2M(uboot),512k(env1),512k(env2),495M(ubi0),14M(res0),2M(res1),512k(res2),512k(res3),-(ubi1)"
> CONFIG_CMD_UBI=y
> CONFIG_ENV_IS_IN_NAND=y
> +CONFIG_NAND=y
> +CONFIG_NAND_MXS=y
> CONFIG_PHYLIB=y
> CONFIG_USB=y
> CONFIG_USB_STORAGE=y
> diff --git a/configs/platinum_titanium_defconfig
> b/configs/platinum_titanium_defconfig
> index c5f6b7ab62..9ef0b80a2c 100644
> --- a/configs/platinum_titanium_defconfig
> +++ b/configs/platinum_titanium_defconfig
> @@ -23,7 +23,6 @@ CONFIG_CMD_BOOTZ=y
> CONFIG_CMD_GPIO=y
> CONFIG_CMD_I2C=y
> CONFIG_CMD_MMC=y
> -CONFIG_CMD_NAND=y
> CONFIG_CMD_NAND_TRIMFFS=y
> CONFIG_CMD_USB=y
> # CONFIG_CMD_SETEXPR is not set
> @@ -41,6 +40,8 @@ CONFIG_MTDIDS_DEFAULT="nand0=gpmi-nand"
>
> CONFIG_MTDPARTS_DEFAULT="mtdparts=gpmi-nand:14M(spl),2M(uboot),512k(env1),512k(env2),-(ubi)"
> CONFIG_CMD_UBI=y
> CONFIG_ENV_IS_IN_NAND=y
> +CONFIG_NAND=y
> +CONFIG_NAND_MXS=y
> CONFIG_PHYLIB=y
> CONFIG_PHY_MICREL=y
> CONFIG_PHY_MICREL_KSZ90X1=y
> diff --git a/configs/titanium_defconfig b/configs/titanium_defconfig
> index c47702ed4e..3a721cdfa5 100644
> --- a/configs/titanium_defconfig
> +++ b/configs/titanium_defconfig
> @@ -11,7 +11,6 @@ CONFIG_CMD_BOOTZ=y
> CONFIG_CMD_GPIO=y
> CONFIG_CMD_I2C=y
> CONFIG_CMD_MMC=y
> -CONFIG_CMD_NAND=y
> CONFIG_CMD_NAND_TRIMFFS=y
> CONFIG_CMD_USB=y
> # CONFIG_CMD_SETEXPR is not set
> @@ -29,6 +28,8 @@ CONFIG_MTDIDS_DEFAULT="nand0=gpmi-nand"
>
> CONFIG_MTDPARTS_DEFAULT="mtdparts=gpmi-nand:16M(uboot),512k(env1),512k(env2),-(ubi)"
> CONFIG_CMD_UBI=y
> CONFIG_ENV_IS_IN_NAND=y
> +CONFIG_NAND=y
> +CONFIG_NAND_MXS=y
> CONFIG_PHYLIB=y
> CONFIG_PHY_MICREL=y
> CONFIG_PHY_MICREL_KSZ90X1=y
> diff --git a/include/configs/aristainetos-common.h
> b/include/configs/aristainetos-common.h
> index 397afbb408..9b1a39d4fd 100644
> --- a/include/configs/aristainetos-common.h
> +++ b/include/configs/aristainetos-common.h
> @@ -176,7 +176,6 @@
> #define CONFIG_SYS_I2C_NOPROBES { {0, 0x00} }
>
> /* 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/cm_fx6.h b/include/configs/cm_fx6.h
> index da870b9baa..90cf024bdb 100644
> --- a/include/configs/cm_fx6.h
> +++ b/include/configs/cm_fx6.h
> @@ -182,7 +182,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 8030ca69e7..d4aaff61fd 100644
> --- a/include/configs/colibri_imx7.h
> +++ b/include/configs/colibri_imx7.h
> @@ -158,8 +158,6 @@
> #define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE
> #endif
>
> -#define CONFIG_NAND_MXS
> -
> /* NAND stuff */
> #define CONFIG_SYS_MAX_NAND_DEVICE 1
> #define CONFIG_SYS_NAND_BASE 0x40000000
> diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h
> index d2944b5db2..517ad08423 100644
> --- a/include/configs/gw_ventana.h
> +++ b/include/configs/gw_ventana.h
> @@ -67,7 +67,6 @@
> #elif defined(CONFIG_SPL_NAND_SUPPORT)
> /* Enable NAND support */
> #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/mx6sabreauto.h b/include/configs/mx6sabreauto.h
> index 64d54b6751..9982685f67 100644
> --- a/include/configs/mx6sabreauto.h
> +++ b/include/configs/mx6sabreauto.h
> @@ -66,7 +66,6 @@
> #define CONFIG_SYS_I2C_SPEED 100000
>
> /* 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 9e46c397a4..02d6acf47e 100644
> --- a/include/configs/mx6sxsabreauto.h
> +++ b/include/configs/mx6sxsabreauto.h
> @@ -119,7 +119,6 @@
> #define CONFIG_SYS_I2C_SPEED 100000
>
> /* 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 3a27c15060..21e51fca41 100644
> --- a/include/configs/mxs.h
> +++ b/include/configs/mxs.h
> @@ -136,7 +136,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 3067fc63ef..6c0902abd4 100644
> --- a/include/configs/pcm058.h
> +++ b/include/configs/pcm058.h
> @@ -58,7 +58,6 @@
>
> #ifndef CONFIG_SPL_BUILD
> /* Enable NAND support */
> -#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/pfla02.h b/include/configs/pfla02.h
> index ae03310040..83198a1065 100644
> --- a/include/configs/pfla02.h
> +++ b/include/configs/pfla02.h
> @@ -57,7 +57,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 453c37d3f8..24c8de932f 100644
> --- a/include/configs/platinum.h
> +++ b/include/configs/platinum.h
> @@ -66,7 +66,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 cc655f2960..ea18cb63e2 100644
> --- a/include/configs/titanium.h
> +++ b/include/configs/titanium.h
> @@ -142,7 +142,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
More information about the U-Boot
mailing list