global: Move remaining CONFIG_SYS_NAND_* to CFG_SYS_NAND_*

[platform/kernel/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 50d5f3e..803dc7f 100644 (file)
--- a/arch/arm/mach-omap2/mem-common.c
+++ b/arch/arm/mach-omap2/mem-common.c
@@ -15,7 +15,11 @@
 #include <common.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
+#if IS_ENABLED(CONFIG_TARGET_AM335X_GUARDIAN)
+#include <asm/arch/mem-guardian.h>
+#else
 #include <asm/arch/mem.h>
+#endif
 #include <asm/arch/sys_proto.h>
 #include <command.h>
 #include <linux/mtd/omap_gpmc.h>
@@ -131,7 +135,7 @@ void set_gpmc_cs0(int flash_type)
 #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;
+               base = CFG_SYS_NAND_BASE;
                size = GPMC_SIZE_16M;
                break;
 #endif