diff options
| author | Wolfgang Denk <wd@pollux.denx.de> | 2006-10-20 23:04:42 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@pollux.denx.de> | 2006-10-20 23:04:42 +0200 |
| commit | 9fa48022e5883a0826a98979c0156f6ac5a0ef79 (patch) | |
| tree | e854c807526ce8b7215446fc34f52832fd0bcc54 /drivers | |
| parent | 34a7ceeff449be015a37d0e3f3178ca313618349 (diff) | |
| parent | ba999c531ed16ec749b2b6f4b0133cee38842b91 (diff) | |
| download | u-boot-imx-9fa48022e5883a0826a98979c0156f6ac5a0ef79.zip u-boot-imx-9fa48022e5883a0826a98979c0156f6ac5a0ef79.tar.gz u-boot-imx-9fa48022e5883a0826a98979c0156f6ac5a0ef79.tar.bz2 | |
Merge with /home/wd/git/u-boot/master
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/nand/nand.c | 9 | ||||
| -rw-r--r-- | drivers/nand/nand_util.c | 6 |
2 files changed, 11 insertions, 4 deletions
diff --git a/drivers/nand/nand.c b/drivers/nand/nand.c index e1781fc..3899045 100644 --- a/drivers/nand/nand.c +++ b/drivers/nand/nand.c @@ -66,8 +66,15 @@ void nand_init(void) size += nand_info[i].size; if (nand_curr_device == -1) nand_curr_device = i; -} + } printf("%lu MiB\n", size / (1024 * 1024)); + +#ifdef CFG_NAND_SELECT_DEVICE + /* + * Select the chip in the board/cpu specific driver + */ + board_nand_select_device(nand_info[nand_curr_device].priv, nand_curr_device); +#endif } #endif diff --git a/drivers/nand/nand_util.c b/drivers/nand/nand_util.c index 5a8e58a..7570210 100644 --- a/drivers/nand/nand_util.c +++ b/drivers/nand/nand_util.c @@ -170,9 +170,9 @@ int nand_erase_opts(nand_info_t *meminfo, const nand_erase_options_t *opts) if (ret > 0) { if (!opts->quiet) printf("\rSkipping bad block at " - "0x%08x " - " \n", - erase.addr); + "0x%08x " + " \n", + erase.addr); continue; } else if (ret < 0) { |