diff options
author | Adrian Schmutzler <freifunk@adrianschmutzler.de> | 2020-04-13 18:43:43 +0200 |
---|---|---|
committer | Adrian Schmutzler <freifunk@adrianschmutzler.de> | 2020-04-24 17:50:12 +0200 |
commit | 5f923498415d79dc500f7ba26c30dde5c9f27586 (patch) | |
tree | d5e987bf4a0890ce17193b8cfee3970ddce31be5 /target/linux/ath79 | |
parent | 7b2731a691f7abb53a8ef3b2bd7b7170f0f87264 (diff) | |
download | upstream-5f923498415d79dc500f7ba26c30dde5c9f27586.tar.gz upstream-5f923498415d79dc500f7ba26c30dde5c9f27586.tar.bz2 upstream-5f923498415d79dc500f7ba26c30dde5c9f27586.zip |
kernel: fix include of myloader.o since kernel 5.4
Between 4.19 and 5.4, mtd parsers have been moved to "parsers"
subdirectory. Based on this, the selection of myloader.o in OpenWrt
was also moved to that subdirectory, while the Kconfig and our local
myloader.c file remained in /drivers/mtd.
This resulted in linking errors like the following (on ath25@5.4):
make[8]: *** No rule to make target 'drivers/mtd/parsers/myloader.o', ...
needed by 'drivers/mtd/parsers/built-in.a'. Stop.
make[7]: *** [scripts/Makefile.build:500: drivers/mtd/parsers] Error 2
make[6]: *** [scripts/Makefile.build:500: drivers/mtd] Error 2
Since myloader.c is not too big, this patch moves it to the kernel patches,
allowing to adjust the path for kernel 5.4 and keeping Makefiles and
file paths better in sync.
Other patches have been refreshed accordingly.
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Diffstat (limited to 'target/linux/ath79')
-rw-r--r-- | target/linux/ath79/patches-5.4/405-mtd-tp-link-partition-parser.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/ath79/patches-5.4/405-mtd-tp-link-partition-parser.patch b/target/linux/ath79/patches-5.4/405-mtd-tp-link-partition-parser.patch index 11d1869544..71951a4ede 100644 --- a/target/linux/ath79/patches-5.4/405-mtd-tp-link-partition-parser.patch +++ b/target/linux/ath79/patches-5.4/405-mtd-tp-link-partition-parser.patch @@ -1,8 +1,8 @@ --- a/drivers/mtd/Kconfig +++ b/drivers/mtd/Kconfig -@@ -62,6 +62,12 @@ config MTD_MYLOADER_PARTS - You will still need the parsing functions to be called by the driver - for your particular device. It won't happen automatically. +@@ -46,6 +46,12 @@ menu "Partition parsers" + source "drivers/mtd/parsers/Kconfig" + endmenu +config MTD_TPLINK_PARTS + tristate "TP-Link AR7XXX/AR9XXX partitioning support" |