Move to 5.4.y (#1686)

* Wireguard: bump tag to most recent since it breaks building on 5.4.y
* Move rockchip current to 5.4.y
* Move sunxi current to 5.4.y
* Move meson64 to 5.4.y
* Move odroidxu4 to 5.4.y and enable "current" targets
* Enable missing target
This commit is contained in:
Igor Pečovnik 2019-12-23 00:40:23 +01:00 committed by GitHub
parent f002ad749c
commit ff4c1488da
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
388 changed files with 48288 additions and 1240143 deletions

View file

@ -1,37 +0,0 @@
diff --git a/drivers/mtd/nand/raw/nand_base.c b/drivers/mtd/nand/raw/nand_base.c
index 71050a0..5f36704 100644
--- a/drivers/mtd/nand/raw/nand_base.c
+++ b/drivers/mtd/nand/raw/nand_base.c
@@ -460,10 +460,7 @@ static int nand_block_checkbad(struct mtd_info *mtd, loff_t ofs, int allowbbt)
struct nand_chip *chip = mtd_to_nand(mtd);
/* Return info from the table */
- if (chip->bbt)
- return nand_isbad_bbt(chip, ofs, allowbbt);
-
- return nand_isbad_bbm(chip, ofs);
+ return 0;
}
/**
@@ -4283,19 +4283,7 @@ static int nand_block_isbad(struct mtd_info *mtd, loff_t offs)
int chipnr = (int)(offs >> chip->chip_shift);
int ret;
- /* Select the NAND device */
- ret = nand_get_device(chip);
- if (ret)
- return ret;
-
- nand_select_target(chip, chipnr);
-
- ret = nand_block_checkbad(chip, offs, 0);
-
- nand_deselect_target(chip);
- nand_release_device(chip);
-
- return ret;
+ return 0;
}
/**