diff options
author | Stefano Babic <sbabic@denx.de> | 2013-04-21 11:32:19 +0200 |
---|---|---|
committer | Stefano Babic <sbabic@denx.de> | 2013-04-21 11:32:19 +0200 |
commit | cd53034613d7bf4a38b673f5c7c0dc2dfe0519c4 (patch) | |
tree | 3fd9296d1c1b42ec0df3a02fa916c84729378a00 /include | |
parent | f2e8a87305a55652488af140adcf65b1e688f287 (diff) | |
parent | e9fd66defd7ed23e7847c418b684f42b9d427493 (diff) | |
download | u-boot-imx-cd53034613d7bf4a38b673f5c7c0dc2dfe0519c4.zip u-boot-imx-cd53034613d7bf4a38b673f5c7c0dc2dfe0519c4.tar.gz u-boot-imx-cd53034613d7bf4a38b673f5c7c0dc2dfe0519c4.tar.bz2 |
Merge branch 'next'
Diffstat (limited to 'include')
-rw-r--r-- | include/configs/mx28evk.h | 1 | ||||
-rw-r--r-- | include/configs/mx6_common.h | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/include/configs/mx28evk.h b/include/configs/mx28evk.h index d470b47..b22a20b 100644 --- a/include/configs/mx28evk.h +++ b/include/configs/mx28evk.h @@ -63,6 +63,7 @@ #define CONFIG_CMD_USB #define CONFIG_CMD_BOOTZ #define CONFIG_CMD_NAND +#define CONFIG_CMD_NAND_TRIMFFS /* Memory configurations */ #define CONFIG_NR_DRAM_BANKS 1 /* 1 bank of DRAM */ diff --git a/include/configs/mx6_common.h b/include/configs/mx6_common.h index b333937..674bcd3 100644 --- a/include/configs/mx6_common.h +++ b/include/configs/mx6_common.h @@ -17,6 +17,7 @@ #ifndef __MX6_COMMON_H #define __MX6_COMMON_H +#define CONFIG_ARM_ERRATA_742230 #define CONFIG_ARM_ERRATA_743622 #define CONFIG_ARM_ERRATA_751472 |