rename CFG_ macros to CONFIG_SYS
[platform/kernel/u-boot.git] / board / omap2420h4 / mem.c
index a3295fd..c8b4186 100644 (file)
@@ -327,7 +327,7 @@ void gpmc_init(void)
        __raw_writel(0x10, GPMC_SYSCONFIG);     /* smart idle */
        __raw_writel(0x0, GPMC_IRQENABLE);      /* isr's sources masked */
        __raw_writel(tval, GPMC_TIMEOUT_CONTROL);/* timeout disable */
-#ifdef CFG_NAND_BOOT
+#ifdef CONFIG_SYS_NAND_BOOT
        __raw_writel(0x001, GPMC_CONFIG);       /* set nWP, disable limited addr */
 #else
        __raw_writel(0x111, GPMC_CONFIG);       /* set nWP, disable limited addr */
@@ -343,7 +343,7 @@ void gpmc_init(void)
        __raw_writel(0x0, GPMC_CONFIG7_0);      /* disable current map */
        sdelay(1000);
 
-#ifdef CFG_NAND_BOOT
+#ifdef CONFIG_SYS_NAND_BOOT
        __raw_writel(H4_24XX_GPMC_CONFIG1_0|mtype|mwidth, GPMC_CONFIG1_0);
 #else
        __raw_writel(H4_24XX_GPMC_CONFIG1_0|mux|mtype|mwidth, GPMC_CONFIG1_0);