diff options
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/Kconfig | 4 | ||||
| -rw-r--r-- | arch/arm/mach-imx/Kconfig | 2 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/mem-common.c | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index f96841c777..f9dab073ea 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -974,7 +974,7 @@ config ARCH_SUNXI select SPL_USE_TINY_PRINTF imply CMD_DM imply CMD_GPT - imply CMD_UBI if NAND + imply CMD_UBI if MTD_RAW_NAND imply DISTRO_DEFAULTS imply FAT_WRITE imply FIT @@ -1004,7 +1004,7 @@ config ARCH_VF610 select CPU_V7A select SYS_FSL_ERRATUM_ESDHC111 imply CMD_MTDPARTS - imply NAND + imply MTD_RAW_NAND config ARCH_ZYNQ bool "Xilinx Zynq based platform" diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig index 751c0b52d7..fee6d56c4d 100644 --- a/arch/arm/mach-imx/Kconfig +++ b/arch/arm/mach-imx/Kconfig @@ -80,7 +80,7 @@ config CMD_HDMIDETECT config CMD_NANDBCB bool "i.MX6 NAND Boot Control Block(BCB) command" - depends on NAND && CMD_MTDPARTS + depends on MTD_RAW_NAND && CMD_MTDPARTS select BCH if MX6UL || MX6ULL default y if (ARCH_MX6 && NAND_MXS) || (ARCH_MX7 && NAND_MXS) help diff --git a/arch/arm/mach-omap2/mem-common.c b/arch/arm/mach-omap2/mem-common.c index ff1e3125a0..50d5f3e9eb 100644 --- a/arch/arm/mach-omap2/mem-common.c +++ b/arch/arm/mach-omap2/mem-common.c @@ -25,7 +25,7 @@ const struct gpmc *gpmc_cfg = (struct gpmc *)GPMC_BASE; #if defined(CONFIG_NOR) char gpmc_cs0_flash = MTD_DEV_TYPE_NOR; -#elif defined(CONFIG_NAND) || defined(CONFIG_CMD_NAND) +#elif defined(CONFIG_MTD_RAW_NAND) || defined(CONFIG_CMD_NAND) char gpmc_cs0_flash = MTD_DEV_TYPE_NAND; #elif defined(CONFIG_CMD_ONENAND) char gpmc_cs0_flash = MTD_DEV_TYPE_ONENAND; @@ -93,7 +93,7 @@ void set_gpmc_cs0(int flash_type) STNOR_GPMC_CONFIG7 }; #endif -#if defined(CONFIG_NAND) || defined(CONFIG_CMD_NAND) +#if defined(CONFIG_MTD_RAW_NAND) || defined(CONFIG_CMD_NAND) const u32 gpmc_regs_nand[GPMC_MAX_REG] = { M_NAND_GPMC_CONFIG1, M_NAND_GPMC_CONFIG2, @@ -128,7 +128,7 @@ void set_gpmc_cs0(int flash_type) GPMC_SIZE_16M))); break; #endif -#if defined(CONFIG_NAND) || defined(CONFIG_CMD_NAND) +#if defined(CONFIG_MTD_RAW_NAND) || defined(CONFIG_CMD_NAND) case MTD_DEV_TYPE_NAND: gpmc_regs = gpmc_regs_nand; base = CONFIG_SYS_NAND_BASE; |