diff options
| author | Justin Waters <justin@justin-linux.(none)> | 2008-01-21 16:38:46 -0500 |
|---|---|---|
| committer | Justin Waters <justin@justin-linux.(none)> | 2008-01-22 11:25:35 -0500 |
| commit | 405bb978ee2321b6cf5381a012c812bdc7679e40 (patch) | |
| tree | fcab2b9817cbadafc512f39972468ea9ccecc8d5 /drivers | |
| parent | 3c7ac4df9c9718e0bf11705a1a4d0e4b9dae700f (diff) | |
Fix various configuration problems with Atmel patch
The CMD API has changed significantly since the patches were originally written. This fixes these problems and cleans up the code a little.
Signed-off-by: Justin Waters <justin.waters@timesys.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/dataflash.c | 2 | ||||
| -rw-r--r-- | drivers/dm9000x.c | 3 | ||||
| -rw-r--r-- | drivers/nand/nand.c | 7 |
3 files changed, 4 insertions, 8 deletions
diff --git a/drivers/dataflash.c b/drivers/dataflash.c index 3d26e9772b..ec149ebbff 100644 --- a/drivers/dataflash.c +++ b/drivers/dataflash.c @@ -61,6 +61,7 @@ dataflash_protect_t area_list[NB_DATAFLASH_AREA] = { {0x38000, 0x1fffff, FLAG_PROTECT_CLEAR}, /* data area size to tune */ }; #endif +#elif #elif defined(CONFIG_NEW_PARTITION) /*define the area offsets*/ /* Invalid partitions should be defined with start > end */ @@ -110,6 +111,7 @@ int AT91F_DataflashInit (void) AT91F_SpiInit (); for (i = 0; i < CFG_MAX_DATAFLASH_BANKS; i++) { + part = 0; found[i] = 0; dataflash_info[i].Desc.state = IDLE; dataflash_info[i].id = 0; diff --git a/drivers/dm9000x.c b/drivers/dm9000x.c index 63f1edb7b6..517e6648e5 100644 --- a/drivers/dm9000x.c +++ b/drivers/dm9000x.c @@ -300,9 +300,10 @@ eth_init(bd_t * bd) DM9000_iow(DM9000_ISR, 0x0f); /* Clear interrupt status */ /* Set Node address */ -#ifndef CONFIG_AT91SAM9261EK + #ifndef CONFIG_AT91SAM9261EK for (i = 0; i < 6; i++) ((u16 *) bd->bi_enetaddr)[i] = read_srom_word(i); + #endif if (is_zero_ether_addr(bd->bi_enetaddr) || is_multicast_ether_addr(bd->bi_enetaddr)) { diff --git a/drivers/nand/nand.c b/drivers/nand/nand.c index bd219135e5..27b5792bcc 100644 --- a/drivers/nand/nand.c +++ b/drivers/nand/nand.c @@ -58,13 +58,6 @@ static void nand_init_chip(struct mtd_info *mtd, struct nand_chip *nand, mtd->size = 0; } - if (nand_scan(mtd, 1) == 0) { - if (!mtd->name) - mtd->name = (char *)default_nand_name; - } else { - mtd->name = NULL; - } - } } void nand_init(void) |