diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-10-18 21:59:44 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-10-18 21:59:44 +0200 |
| commit | f82642e33899766892499b163e60560fbbf87773 (patch) | |
| tree | ab90f076f18e56b2b3e8c9375b95917daa78c1d9 /include/asm-arm/arch-omap24xx/mem.h | |
| parent | b59b16ca24bc7e77ec113021a6d77b9b32fcf192 (diff) | |
| parent | 360fe71e82b83e264c964c9447c537e9a1f643c8 (diff) | |
| download | u-boot-imx-f82642e33899766892499b163e60560fbbf87773.zip u-boot-imx-f82642e33899766892499b163e60560fbbf87773.tar.gz u-boot-imx-f82642e33899766892499b163e60560fbbf87773.tar.bz2 | |
Merge 'next' branch
Conflicts:
board/freescale/mpc8536ds/mpc8536ds.c
include/configs/mgcoge.h
Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'include/asm-arm/arch-omap24xx/mem.h')
| -rw-r--r-- | include/asm-arm/arch-omap24xx/mem.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/asm-arm/arch-omap24xx/mem.h b/include/asm-arm/arch-omap24xx/mem.h index c81f1c4..42e8ab2 100644 --- a/include/asm-arm/arch-omap24xx/mem.h +++ b/include/asm-arm/arch-omap24xx/mem.h @@ -103,7 +103,7 @@ typedef enum { /* GPMC settings */ #ifdef PRCM_CONFIG_II /* L3 at 100MHz */ -# ifdef CFG_NAND_BOOT +# ifdef CONFIG_SYS_NAND_BOOT # define H4_24XX_GPMC_CONFIG1_0 0x0 # define H4_24XX_GPMC_CONFIG2_0 0x00141400 # define H4_24XX_GPMC_CONFIG3_0 0x00141400 @@ -116,7 +116,7 @@ typedef enum { # define H4_24XX_GPMC_CONFIG3_0 0x00050502 # define H4_24XX_GPMC_CONFIG4_0 0x0C060C06 # define H4_24XX_GPMC_CONFIG5_0 0x01131F1F -# endif /* endif CFG_NAND_BOOT */ +# endif /* endif CONFIG_SYS_NAND_BOOT */ # define H4_24XX_GPMC_CONFIG7_0 (0x00000C40|(H4_CS0_BASE >> 24)) # define H4_24XX_GPMC_CONFIG1_1 0x00011000 # define H4_24XX_GPMC_CONFIG2_1 0x001F1F00 @@ -128,7 +128,7 @@ typedef enum { #endif /* endif PRCM_CONFIG_II */ #ifdef PRCM_CONFIG_III /* L3 at 133MHz */ -# ifdef CFG_NAND_BOOT +# ifdef CONFIG_SYS_NAND_BOOT # define H4_24XX_GPMC_CONFIG1_0 0x0 # define H4_24XX_GPMC_CONFIG2_0 0x00141400 # define H4_24XX_GPMC_CONFIG3_0 0x00141400 @@ -142,7 +142,7 @@ typedef enum { # define H4_24XX_GPMC_CONFIG4_0 0x10081008 # define H4_24XX_GPMC_CONFIG5_0 0x01131F1F # define H4_24XX_GPMC_CONFIG6_0 0x000004c4 -# endif /* endif CFG_NAND_BOOT */ +# endif /* endif CONFIG_SYS_NAND_BOOT */ # define H4_24XX_GPMC_CONFIG7_0 (0x00000C40|(H4_CS0_BASE >> 24)) # define H4_24XX_GPMC_CONFIG1_1 0x00011000 # define H4_24XX_GPMC_CONFIG2_1 0x001f1f01 @@ -151,6 +151,6 @@ typedef enum { # define H4_24XX_GPMC_CONFIG5_1 0x041f1F1F # define H4_24XX_GPMC_CONFIG6_1 0x000004C4 # define H4_24XX_GPMC_CONFIG7_1 (0x00000F40|(H4_CS1_BASE >> 24)) -#endif /* endif CFG_PRCM_III */ +#endif /* endif CONFIG_SYS_PRCM_III */ #endif /* endif _OMAP24XX_MEM_H_ */ |