* 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
diff --git a/board/at91rm9200dk/at91rm9200dk.c b/board/at91rm9200dk/at91rm9200dk.c
index ffd9687..8a05c53 100644
--- a/board/at91rm9200dk/at91rm9200dk.c
+++ b/board/at91rm9200dk/at91rm9200dk.c
@@ -66,7 +66,7 @@
* 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 @@
*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
diff --git a/board/dave/PPChameleonEVB/PPChameleonEVB.c b/board/dave/PPChameleonEVB/PPChameleonEVB.c
index d015f69..47670fa 100644
--- a/board/dave/PPChameleonEVB/PPChameleonEVB.c
+++ b/board/dave/PPChameleonEVB/PPChameleonEVB.c
@@ -255,16 +255,20 @@
/* ------------------------------------------------------------------------- */
#if (CONFIG_COMMANDS & CFG_CMD_NAND)
-extern void
+extern ulong
nand_probe(ulong physadr);
void
nand_init(void)
{
+ ulong totlen;
+
debug ("Probing at 0x%.8x\n", CFG_NAND0_BASE);
- nand_probe (CFG_NAND0_BASE);
+ totlen = nand_probe (CFG_NAND0_BASE);
debug ("Probing at 0x%.8x\n", CFG_NAND1_BASE);
- nand_probe (CFG_NAND1_BASE);
+ totlen += nand_probe (CFG_NAND1_BASE);
+
+ printf ("%4lu MB\n", totlen >>20);
}
#endif
diff --git a/board/esd/ash405/ash405.c b/board/esd/ash405/ash405.c
index 50dbade..edca8b2 100644
--- a/board/esd/ash405/ash405.c
+++ b/board/esd/ash405/ash405.c
@@ -239,15 +239,11 @@
/* ------------------------------------------------------------------------- */
#if (CONFIG_COMMANDS & CFG_CMD_NAND)
-#include <linux/mtd/nand.h>
-extern struct nand_chip nand_dev_desc[CFG_MAX_NAND_DEVICE];
void nand_init(void)
{
- nand_probe(CFG_NAND_BASE);
- if (nand_dev_desc[0].ChipID != NAND_ChipID_UNKNOWN) {
- puts("NAND: ");
- print_size(nand_dev_desc[0].totlen, "\n");
- }
+ unsigned long totlen = nand_probe(CFG_NAND_BASE);
+
+ printf ("%4lu MB\n", totlen >> 20);
}
#endif
diff --git a/board/mpl/vcma9/vcma9.c b/board/mpl/vcma9/vcma9.c
index 1df5c38..359e565 100644
--- a/board/mpl/vcma9/vcma9.c
+++ b/board/mpl/vcma9/vcma9.c
@@ -144,7 +144,7 @@
* NAND flash initialization.
*/
#if (CONFIG_COMMANDS & CFG_CMD_NAND)
-extern void
+extern ulong
nand_probe(ulong physadr);
@@ -177,10 +177,15 @@
nand_init(void)
{
S3C2410_NAND * const nand = S3C2410_GetBase_NAND();
+ unsigned totlen;
NF_Init();
+#ifdef DEBUG
printf("NAND flash probing at 0x%.8lX\n", (ulong)nand);
- nand_probe((ulong)nand);
+#endif
+ totlen = nand_probe((ulong)nand) >> 20;
+
+ printf ("%4lu MB\n", totlen >> 20);
}
#endif
diff --git a/board/netvia/netvia.c b/board/netvia/netvia.c
index 9dd732b..db36b22 100644
--- a/board/netvia/netvia.c
+++ b/board/netvia/netvia.c
@@ -420,16 +420,13 @@
#include <linux/mtd/nand.h>
-extern void nand_probe(ulong physadr);
+extern ulong nand_probe(ulong physadr);
extern struct nand_chip nand_dev_desc[CFG_MAX_NAND_DEVICE];
void nand_init(void)
{
- nand_probe(CFG_NAND_BASE);
- if (nand_dev_desc[0].ChipID != NAND_ChipID_UNKNOWN) {
- nand_dev_desc[0].name = "NetVia NAND flash";
- puts("NAND: ");
- print_size(nand_dev_desc[0].totlen, "\n");
- }
+ unsigned long totlen = nand_probe(CFG_NAND_BASE);
+
+ printf ("%4lu MB\n", totlen >> 20);
}
#endif
diff --git a/board/sixnet/sixnet.c b/board/sixnet/sixnet.c
index 4025b47..63c57c9 100644
--- a/board/sixnet/sixnet.c
+++ b/board/sixnet/sixnet.c
@@ -330,11 +330,9 @@
#if (CONFIG_COMMANDS & CFG_CMD_NAND)
void nand_init(void)
{
- nand_probe(CFG_DFLASH_BASE); /* see if any NAND flash present */
- if (nand_dev_desc[0].ChipID != NAND_ChipID_UNKNOWN) {
- puts("NAND: ");
- print_size(nand_dev_desc[0].totlen, "\n");
- }
+ unsigned long totlen = nand_probe(CFG_NAND_BASE);
+
+ printf ("%4lu MB\n", totlen >> 20);
}
#endif