diff options
| author | Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> | 2008-05-24 12:56:53 +0200 |
|---|---|---|
| committer | Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> | 2008-05-24 12:56:53 +0200 |
| commit | 42fd5f87b1613d3039f57e93c16f760a768d3e84 (patch) | |
| tree | 9dd0252fca37dbdb1148ce7fd44dc5c9dd8a6b34 /board/atmel/at91sam9260ek/at91sam9260ek.c | |
| parent | 2c8d41969b47eb0b973912830c58689b2ba0e50a (diff) | |
| parent | 54694a91428f6c3280fe1ee0923488a1e7e8dbc4 (diff) | |
| download | talos-obmc-uboot-42fd5f87b1613d3039f57e93c16f760a768d3e84.tar.gz talos-obmc-uboot-42fd5f87b1613d3039f57e93c16f760a768d3e84.zip | |
Merging Stelian Pop AT91 patches
Merge branch 'testing-V2'
Conflicts:
board/atmel/at91cap9adk/Makefile
Fixing copyright
board/atmel/at91sam9260ek/Makefile
Fixing copyright
board/atmel/at91sam9260ek/u-boot.lds
Delete no more needed ld script
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Diffstat (limited to 'board/atmel/at91sam9260ek/at91sam9260ek.c')
| -rw-r--r-- | board/atmel/at91sam9260ek/at91sam9260ek.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/board/atmel/at91sam9260ek/at91sam9260ek.c b/board/atmel/at91sam9260ek/at91sam9260ek.c index b30aad8373..ef4d486be5 100644 --- a/board/atmel/at91sam9260ek/at91sam9260ek.c +++ b/board/atmel/at91sam9260ek/at91sam9260ek.c @@ -90,7 +90,12 @@ static void at91sam9260ek_nand_hw_init(void) at91_sys_write(AT91_SMC_MODE(3), AT91_SMC_READMODE | AT91_SMC_WRITEMODE | AT91_SMC_EXNWMODE_DISABLE | - AT91_SMC_DBW_8 | AT91_SMC_TDF_(2)); +#ifdef CFG_NAND_DBW_16 + AT91_SMC_DBW_16 | +#else /* CFG_NAND_DBW_8 */ + AT91_SMC_DBW_8 | +#endif + AT91_SMC_TDF_(2)); at91_sys_write(AT91_PMC_PCER, 1 << AT91SAM9260_ID_PIOC); |
