diff options
author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-05-11 22:24:28 +0200 |
---|---|---|
committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-05-11 22:24:28 +0200 |
commit | cac423a730d3506154744485af1bbc1cd3a1e6a8 (patch) | |
tree | 358b627972d9125de573c623f33e2da789f1de51 /include/configs/da850evm.h | |
parent | c1b43ac7699640c8086bd73faa798bc9722d32c9 (diff) | |
parent | 47c6ea076eb51e624f8744d93db5cd70b97dc25d (diff) | |
download | u-boot-imx-cac423a730d3506154744485af1bbc1cd3a1e6a8.zip u-boot-imx-cac423a730d3506154744485af1bbc1cd3a1e6a8.tar.gz u-boot-imx-cac423a730d3506154744485af1bbc1cd3a1e6a8.tar.bz2 |
Merge branch 'u-boot-ti/master' into 'u-boot-arm/master'
Diffstat (limited to 'include/configs/da850evm.h')
-rw-r--r-- | include/configs/da850evm.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/configs/da850evm.h b/include/configs/da850evm.h index 583568d..c420967 100644 --- a/include/configs/da850evm.h +++ b/include/configs/da850evm.h @@ -199,8 +199,8 @@ #define CONFIG_SYS_NAND_PAGE_2K #define CONFIG_SYS_NAND_CS 3 #define CONFIG_SYS_NAND_BASE DAVINCI_ASYNC_EMIF_DATA_CE3_BASE -#define CONFIG_SYS_CLE_MASK 0x10 -#define CONFIG_SYS_ALE_MASK 0x8 +#define CONFIG_SYS_NAND_MASK_CLE 0x10 +#define CONFIG_SYS_NAND_MASK_ALE 0x8 #undef CONFIG_SYS_NAND_HW_ECC #define CONFIG_SYS_MAX_NAND_DEVICE 1 /* Max number of NAND devices */ #define CONFIG_SYS_NAND_HW_ECC_OOBFIRST |