diff options
| author | Tom Rini <trini@ti.com> | 2014-06-08 07:58:41 -0400 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-06-08 07:58:41 -0400 |
| commit | 55e8250bd3cfd996d1caa04f520160a89ec04754 (patch) | |
| tree | 64060c77eb5467f9a4c5ee421978db49d1a48ad3 /board/compulab/cm_t35 | |
| parent | 3e1fa221f94b7ae3389d166882b77f1da5895f22 (diff) | |
| parent | 5ed28948a3ffe6c735386e59c132989869beaa3e (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'board/compulab/cm_t35')
| -rw-r--r-- | board/compulab/cm_t35/cm_t35.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/board/compulab/cm_t35/cm_t35.c b/board/compulab/cm_t35/cm_t35.c index 00bcf41bb3..0944903ec8 100644 --- a/board/compulab/cm_t35/cm_t35.c +++ b/board/compulab/cm_t35/cm_t35.c @@ -54,12 +54,12 @@ static u32 gpmc_net_config[GPMC_MAX_REG] = { }; static u32 gpmc_nand_config[GPMC_MAX_REG] = { - SMNAND_GPMC_CONFIG1, - SMNAND_GPMC_CONFIG2, - SMNAND_GPMC_CONFIG3, - SMNAND_GPMC_CONFIG4, - SMNAND_GPMC_CONFIG5, - SMNAND_GPMC_CONFIG6, + M_NAND_GPMC_CONFIG1, + M_NAND_GPMC_CONFIG2, + M_NAND_GPMC_CONFIG3, + M_NAND_GPMC_CONFIG4, + M_NAND_GPMC_CONFIG5, + M_NAND_GPMC_CONFIG6, 0, }; |