diff options
author | Tom Rini <trini@konsulko.com> | 2023-02-28 09:46:07 -0500 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2023-02-28 09:46:07 -0500 |
commit | c12fe739ea1ea9ba4ca289bd4e7b1293a9ccb256 (patch) | |
tree | 9bf4ff7375b626e8c69a5862eb0b49866e28fb97 /drivers/mtd/nand/raw/nand_bbt.c | |
parent | 5b197eee334bdf75cc9e9148161299679a5251ea (diff) | |
parent | d9fa61f54e7f9ac3e31c362cddda834675200a23 (diff) |
Merge tag 'u-boot-nand-20230227' of https://source.denx.de/u-boot/custodians/u-boot-nand-flash into next
Pull request for u-boot-nand-20230227
- mark reserved blocks from Ashok Reddy Soma
- backport BRCMNAND changes from Linux from Linus Walleij
- fix display of unknown raw ID from Patrice Chotard
- show reserved block in chip.erase from Michael Trimarchi
Diffstat (limited to 'drivers/mtd/nand/raw/nand_bbt.c')
-rw-r--r-- | drivers/mtd/nand/raw/nand_bbt.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/mtd/nand/raw/nand_bbt.c b/drivers/mtd/nand/raw/nand_bbt.c index 911472e91e..cd451870a6 100644 --- a/drivers/mtd/nand/raw/nand_bbt.c +++ b/drivers/mtd/nand/raw/nand_bbt.c @@ -1330,6 +1330,7 @@ int nand_isreserved_bbt(struct mtd_info *mtd, loff_t offs) * @mtd: MTD device structure * @offs: offset in the device * @allowbbt: allow access to bad block table region + * Return: 0 - good block, 1- bad block, 2 - reserved block */ int nand_isbad_bbt(struct mtd_info *mtd, loff_t offs, int allowbbt) { @@ -1348,7 +1349,7 @@ int nand_isbad_bbt(struct mtd_info *mtd, loff_t offs, int allowbbt) case BBT_BLOCK_WORN: return 1; case BBT_BLOCK_RESERVED: - return allowbbt ? 0 : 1; + return allowbbt ? 0 : 2; } return 1; } |