diff options
| author | Tom Rini <trini@konsulko.com> | 2015-03-31 19:15:59 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-03-31 19:15:59 -0400 |
| commit | 10697704ca579850b0edc0e772671c32586d76ee (patch) | |
| tree | f21e248ad0a081d56f96c16d524be5761a46091e /drivers/mtd | |
| parent | 482cbd553daf3d9cd21e564702bac84a6bd43f2f (diff) | |
| parent | b2d387bcebba352ca64b781486507800964d7ffd (diff) | |
| download | talos-obmc-uboot-10697704ca579850b0edc0e772671c32586d76ee.tar.gz talos-obmc-uboot-10697704ca579850b0edc0e772671c32586d76ee.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-atmel
Diffstat (limited to 'drivers/mtd')
| -rw-r--r-- | drivers/mtd/nand/atmel_nand.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/mtd/nand/atmel_nand.c b/drivers/mtd/nand/atmel_nand.c index b16e3aa157..a2016e7945 100644 --- a/drivers/mtd/nand/atmel_nand.c +++ b/drivers/mtd/nand/atmel_nand.c @@ -1456,6 +1456,9 @@ int board_nand_init(struct nand_chip *nand) nand->dev_ready = at91_nand_wait_ready; #endif nand->chip_delay = 20; +#ifdef CONFIG_SYS_NAND_USE_FLASH_BBT + nand->bbt_options |= NAND_BBT_USE_FLASH; +#endif #ifdef CONFIG_ATMEL_NAND_HWECC #ifdef CONFIG_ATMEL_NAND_HW_PMECC @@ -1522,6 +1525,9 @@ int atmel_nand_chip_init(int devnum, ulong base_addr) nand->dev_ready = at91_nand_ready; #endif nand->chip_delay = 75; +#ifdef CONFIG_SYS_NAND_USE_FLASH_BBT + nand->bbt_options |= NAND_BBT_USE_FLASH; +#endif ret = nand_scan_ident(mtd, CONFIG_SYS_NAND_MAX_CHIPS, NULL); if (ret) |
