domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

generic: fix patching error on kernel 5.4

Browse Source 
Fixes a build error seen when applying the kernel patches.

Applying patch generic/435-mtd-add-routerbootpart-parser-config.patch
patching file drivers/mtd/parsers/Kconfig
Hunk #1 FAILED at 160.
1 out of 1 hunk FAILED -- rejects in file drivers/mtd/parsers/Kconfig
patching file drivers/mtd/parsers/Makefile
Hunk #1 FAILED at 10.
1 out of 1 hunk FAILED -- rejects in file drivers/mtd/parsers/Makefile

This was missed as 5.4 is currently set as testing kernel
while the main kernel being used is 4.19

Fixes: 2976e423dc ("generic: routerboot partition build bits")
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
This commit is contained in:
Koen Vandeputte
2020-05-08 16:48:19 +02:00
parent 5e50515fa6
commit 51a7184a7d
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
target/linux/generic/pending-5.4/435-mtd-add-routerbootpart-parser-config.patch
View File

@@ -16,23 +16,25 @@ Signed-off-by: Thibaut VARÈNE <hacks@slashdirt.org>
--- a/drivers/mtd/parsers/Kconfig --- a/drivers/mtd/parsers/Kconfig
+++ b/drivers/mtd/parsers/Kconfig +++ b/drivers/mtd/parsers/Kconfig
@@ -160,3 +160,12 @@ config MTD_REDBOOT_PARTS_READONLY @@ -176,3 +176,12 @@ config MTD_MYLOADER_PARTS
'FIS directory' images, enable this option.
endif # MTD_REDBOOT_PARTS You will still need the parsing functions to be called by the driver
for your particular device. It won't happen automatically.
+ +
+config MTD_ROUTERBOOT_PARTS +config MTD_ROUTERBOOT_PARTS
+ tristate "RouterBoot flash partition parser" + tristate "RouterBoot flash partition parser"
+ depends on MTD && OF + depends on MTD && OF
+ help + help
+ MikroTik RouterBoot is implemented as a multi segment system on the + MikroTik RouterBoot is implemented as a multi segment system on the
+ flash, some of which are fixed and some of which are located at + flash, some of which are fixed and some of which are located at
+ variable offsets. This parser handles both cases via properly + variable offsets. This parser handles both cases via properly
+ formatted DTS. + formatted DTS.
--- a/drivers/mtd/parsers/Makefile --- a/drivers/mtd/parsers/Makefile
+++ b/drivers/mtd/parsers/Makefile +++ b/drivers/mtd/parsers/Makefile
@@ -10,3 +10,4 @@ @@ -9,4 +9,5 @@ obj-$(CONFIG_MTD_AFS_PARTS) += afs.o
obj-$(CONFIG_MTD_PARSER_TRX) += parser_trx.o
obj-$(CONFIG_MTD_SHARPSL_PARTS) += sharpslpart.o obj-$(CONFIG_MTD_SHARPSL_PARTS) += sharpslpart.o
obj-$(CONFIG_MTD_REDBOOT_PARTS) += redboot.o obj-$(CONFIG_MTD_REDBOOT_PARTS) += redboot.o
obj-$(CONFIG_MTD_MYLOADER_PARTS) += myloader.o -obj-$(CONFIG_MTD_MYLOADER_PARTS) += myloader.o
+obj-$(CONFIG_MTD_MYLOADER_PARTS) += myloader.o
+obj-$(CONFIG_MTD_ROUTERBOOT_PARTS) += routerbootpart.o +obj-$(CONFIG_MTD_ROUTERBOOT_PARTS) += routerbootpart.o