From a43278a43d522fba7fea0ed3045b718a9c8d22ac Mon Sep 17 00:00:00 2001 From: wdenk Date: Thu, 11 Sep 2003 19:48:06 +0000 Subject: * Patch by Gary Jennejohn, 11 Sep 2003: - allow for longer timeouts for USB mass storage devices * Patch by Denis Peter, 11 Sep 2003: - fix USB data pointer assignment for bulk only transfer. - prevent to display erased directories in FAT filesystem. * Change output format for NAND flash - make it look like for other memory, too --- board/at91rm9200dk/at91rm9200dk.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'board/at91rm9200dk') diff --git a/board/at91rm9200dk/at91rm9200dk.c b/board/at91rm9200dk/at91rm9200dk.c index ffd9687bf4..8a05c5321f 100644 --- a/board/at91rm9200dk/at91rm9200dk.c +++ b/board/at91rm9200dk/at91rm9200dk.c @@ -66,7 +66,7 @@ int dram_init (void) * The NAND lives in the CS2* space */ #if (CONFIG_COMMANDS & CFG_CMD_NAND) -extern void nand_probe (ulong physadr); +extern ulong nand_probe (ulong physadr); #define AT91_SMARTMEDIA_BASE 0x40000000 /* physical address to access memory on NCS3 */ void nand_init (void) @@ -103,10 +103,12 @@ void nand_init (void) *AT91C_PIOB_ODR = AT91C_PIO_PB1; /* disable output */ if (*AT91C_PIOB_PDSR & AT91C_PIO_PB1) - printf ("No "); - printf ("SmartMedia card inserted\n"); + printf (" No SmartMedia card inserted\n"); +#ifdef DEBUG + printf (" SmartMedia card inserted\n"); printf ("Probing at 0x%.8x\n", AT91_SMARTMEDIA_BASE); - nand_probe (AT91_SMARTMEDIA_BASE); +#endif + printf ("%4lu MB\n", nand_probe(AT91_SMARTMEDIA_BASE) >> 20); } #endif -- cgit