From 586872da59946a378d75d2d0ab4e3da93b4b9979 Mon Sep 17 00:00:00 2001 From: Sergey Ryazanov Date: Mon, 21 May 2018 12:19:29 +0300 Subject: ath25: add kernel 4.14 support Copy and refresh patches and config from 4.9, no more work is need. Signed-off-by: Sergey Ryazanov (cherry picked from commit 3d69857ac1647e5bc924a9af1e8d00182316cb0d) --- .../patches-4.14/141-redboot_partition_scan.patch | 44 ++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 target/linux/ath25/patches-4.14/141-redboot_partition_scan.patch (limited to 'target/linux/ath25/patches-4.14/141-redboot_partition_scan.patch') diff --git a/target/linux/ath25/patches-4.14/141-redboot_partition_scan.patch b/target/linux/ath25/patches-4.14/141-redboot_partition_scan.patch new file mode 100644 index 0000000000..d1d281eaf4 --- /dev/null +++ b/target/linux/ath25/patches-4.14/141-redboot_partition_scan.patch @@ -0,0 +1,44 @@ +--- a/drivers/mtd/redboot.c ++++ b/drivers/mtd/redboot.c +@@ -79,12 +79,18 @@ static int parse_redboot_partitions(stru + static char nullstring[] = "unallocated"; + #endif + ++ buf = vmalloc(master->erasesize); ++ if (!buf) ++ return -ENOMEM; ++ ++ restart: + if ( directory < 0 ) { + offset = master->size + directory * master->erasesize; + while (mtd_block_isbad(master, offset)) { + if (!offset) { + nogood: + printk(KERN_NOTICE "Failed to find a non-bad block to check for RedBoot partition table\n"); ++ vfree(buf); + return -EIO; + } + offset -= master->erasesize; +@@ -97,10 +103,6 @@ static int parse_redboot_partitions(stru + goto nogood; + } + } +- buf = vmalloc(master->erasesize); +- +- if (!buf) +- return -ENOMEM; + + printk(KERN_NOTICE "Searching for RedBoot partition table in %s at offset 0x%lx\n", + master->name, offset); +@@ -173,6 +175,11 @@ static int parse_redboot_partitions(stru + } + if (i == numslots) { + /* Didn't find it */ ++ if (offset + master->erasesize < master->size) { ++ /* not at the end of the flash yet, maybe next block */ ++ directory++; ++ goto restart; ++ } + printk(KERN_NOTICE "No RedBoot partition table detected in %s\n", + master->name); + ret = 0; -- cgit v1.2.3