Merge tag 'u-boot-atmel-fixes-2020.07-a' of https://gitlab.denx.de/u-boot/custodians...

[oweals/u-boot.git] / arch / arm / mach-omap2 / mem-common.c

diff --git a/arch/arm/mach-omap2/mem-common.c b/arch/arm/mach-omap2/mem-common.c
index d72e82e028338b01d149c6f2fda86d6e839bd2e6..50d5f3e9ebaf9dab2ee327af8dbb29cb424d0335 100644 (file)
--- a/arch/arm/mach-omap2/mem-common.c
+++ b/arch/arm/mach-omap2/mem-common.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2010
  * Texas Instruments, <www.ti.com>
@@ -9,8 +10,6 @@
  *     Manikandan Pillai <mani.pillai@ti.com>
  *     Richard Woodruff <r-woodruff2@ti.com>
  *     Syed Mohammed Khasim <khasim@ti.com>
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
@@ -26,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;
@@ -94,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,
@@ -129,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;