projects
/
openwrt
/
staging
/
jow.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
6973441
)
kernel: bump 4.14 to 4.14.79
author
Koen Vandeputte
<koen.vandeputte@ncentric.com>
Mon, 5 Nov 2018 10:22:43 +0000
(11:22 +0100)
committer
Koen Vandeputte
<koen.vandeputte@ncentric.com>
Mon, 5 Nov 2018 15:00:00 +0000
(16:00 +0100)
Refreshed all patches.
Compile-tested on: ar71xx, cns3xxx, imx6, x86_64
Runtime-tested on: ar71xx, cns3xxx, imx6, x86_64
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
40 files changed:
include/kernel-version.mk
patch
|
blob
|
history
target/linux/ar71xx/patches-4.14/500-MIPS-fw-myloader.patch
patch
|
blob
|
history
target/linux/ar71xx/patches-4.14/604-MIPS-ath79-no-of.patch
patch
|
blob
|
history
target/linux/ath25/patches-4.14/107-ar5312_gpio.patch
patch
|
blob
|
history
target/linux/ath79/patches-4.14/0011-MIPS-ath79-select-the-PINCTRL-subsystem.patch
patch
|
blob
|
history
target/linux/ath79/patches-4.14/0028-MIPS-ath79-drop-machfiles.patch
patch
|
blob
|
history
target/linux/ath79/patches-4.14/0032-MIPS-ath79-sanitize-symbols.patch
patch
|
blob
|
history
target/linux/bcm53xx/patches-4.14/400-mtd-spi-nor-detect-JEDEC-incompatible-w25q128-using-.patch
patch
|
blob
|
history
target/linux/brcm63xx/patches-4.14/001-4.15-01-MIPS-BCM63XX-add-clkdev-lookup-support.patch
patch
|
blob
|
history
target/linux/brcm63xx/patches-4.14/322-MIPS-BCM63XX-switch-to-IRQ_DOMAIN.patch
patch
|
blob
|
history
target/linux/generic/backport-4.14/012-kbuild-add-macro-for-controlling-warnings-to-linux-c.patch
patch
|
blob
|
history
target/linux/generic/backport-4.14/293-v4.16-netfilter-reduce-size-of-hook-entry-point-locations.patch
patch
|
blob
|
history
target/linux/generic/hack-4.14/220-gc_sections.patch
patch
|
blob
|
history
target/linux/generic/hack-4.14/301-mips_image_cmdline_hack.patch
patch
|
blob
|
history
target/linux/generic/hack-4.14/661-use_fq_codel_by_default.patch
patch
|
blob
|
history
target/linux/generic/pending-4.14/201-extra_optimization.patch
patch
|
blob
|
history
target/linux/generic/pending-4.14/300-mips_expose_boot_raw.patch
patch
|
blob
|
history
target/linux/generic/pending-4.14/304-mips_disable_fpu.patch
patch
|
blob
|
history
target/linux/generic/pending-4.14/341-MIPS-mm-remove-no-op-dma_map_ops-where-possible.patch
patch
|
blob
|
history
target/linux/generic/pending-4.14/450-mtd-spi-nor-allow-NOR-driver-to-write-fewer-bytes-th.patch
patch
|
blob
|
history
target/linux/generic/pending-4.14/465-m25p80-mx-disable-software-protection.patch
patch
|
blob
|
history
target/linux/generic/pending-4.14/466-Revert-mtd-spi-nor-fix-Spansion-regressions-aliased-.patch
patch
|
blob
|
history
target/linux/generic/pending-4.14/470-mtd-spi-nor-support-limiting-4K-sectors-support-base.patch
patch
|
blob
|
history
target/linux/generic/pending-4.14/475-mtd-spi-nor-Add-Winbond-w25q128jv-support.patch
patch
|
blob
|
history
target/linux/generic/pending-4.14/477-mtd-add-spi-nor-add-mx25u3235f.patch
patch
|
blob
|
history
target/linux/generic/pending-4.14/478-mtd-spi-nor-Add-support-for-XM25QH64A-and-XM25QH128A.patch
patch
|
blob
|
history
target/linux/generic/pending-4.14/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch
patch
|
blob
|
history
target/linux/generic/pending-4.14/701-phy_extension.patch
patch
|
blob
|
history
target/linux/ipq40xx/patches-4.14/303-spi-nor-enable-4B-opcodes-for-mx25l25635f.patch
patch
|
blob
|
history
target/linux/ipq806x/patches-4.14/105-mtd-nor-add-mx25l25635f.patch
patch
|
blob
|
history
target/linux/lantiq/patches-4.14/0152-lantiq-VPE.patch
patch
|
blob
|
history
target/linux/mediatek/patches-4.14/0052-net-phy-add-FC.patch
patch
|
blob
|
history
target/linux/oxnas/patches-4.14/010-add-console-to-pogoplogv3-bootargs.patch
patch
|
blob
|
history
target/linux/pistachio/patches-4.14/401-mtd-nor-support-mtd-name-from-device-tree.patch
patch
|
blob
|
history
target/linux/ramips/patches-4.14/0025-pinctrl-ralink-add-pinctrl-driver.patch
patch
|
blob
|
history
target/linux/ramips/patches-4.14/0028-GPIO-ralink-add-mt7621-gpio-controller.patch
patch
|
blob
|
history
target/linux/ramips/patches-4.14/0031-uvc-add-iPassion-iP2970-support.patch
patch
|
blob
|
history
target/linux/ramips/patches-4.14/0053-mtd-spi-nor-add-w25q256-3b-mode-switch.patch
patch
|
blob
|
history
target/linux/ramips/patches-4.14/0054-mtd-spi-nor-w25q256-respect-default-mode.patch
patch
|
blob
|
history
target/linux/ramips/patches-4.14/303-spi-nor-enable-4B-opcodes-for-mx66l51235l.patch
patch
|
blob
|
history
diff --git
a/include/kernel-version.mk
b/include/kernel-version.mk
index 944d40db12315465a01829bfda3528e93e42332d..fe20a2654a0fd01605f95728abddc34d8a30eab6 100644
(file)
--- a/
include/kernel-version.mk
+++ b/
include/kernel-version.mk
@@
-4,11
+4,11
@@
LINUX_RELEASE?=1
LINUX_VERSION-3.18 = .124
LINUX_VERSION-4.9 = .135
LINUX_VERSION-3.18 = .124
LINUX_VERSION-4.9 = .135
-LINUX_VERSION-4.14 = .7
8
+LINUX_VERSION-4.14 = .7
9
LINUX_KERNEL_HASH-3.18.124 = 25d2a5abd627534a1e51d028890c184aad8e628c345c5fe0cc0f9d7c31b7a5a3
LINUX_KERNEL_HASH-4.9.135 = e023b0bbe9ea7fc56aa57210342dd18ea3e0900ee207226df1523c6d7df154ce
LINUX_KERNEL_HASH-3.18.124 = 25d2a5abd627534a1e51d028890c184aad8e628c345c5fe0cc0f9d7c31b7a5a3
LINUX_KERNEL_HASH-4.9.135 = e023b0bbe9ea7fc56aa57210342dd18ea3e0900ee207226df1523c6d7df154ce
-LINUX_KERNEL_HASH-4.14.7
8 = f4da4dc0f079e420e1c1b8c71312eaa5415b08be847aa224a61d8af6a6e74c6c
+LINUX_KERNEL_HASH-4.14.7
9 = 5619071eceb27f903d2fce1784223796bfbe25528f9690273cdfe82fdd9b933a
remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))
sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1)))))))
remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))
sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1)))))))
diff --git
a/target/linux/ar71xx/patches-4.14/500-MIPS-fw-myloader.patch
b/target/linux/ar71xx/patches-4.14/500-MIPS-fw-myloader.patch
index 4ac1fd193e818e095058376d8184f50f9786f88c..5c526794fde6cbfae98a5f42bd65c2ff23298317 100644
(file)
--- a/
target/linux/ar71xx/patches-4.14/500-MIPS-fw-myloader.patch
+++ b/
target/linux/ar71xx/patches-4.14/500-MIPS-fw-myloader.patch
@@
-10,7
+10,7
@@
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
-@@ -115
1,6 +1151
,9 @@ config MIPS_MSC
+@@ -115
2,6 +1152
,9 @@ config MIPS_MSC
config MIPS_NILE4
bool
config MIPS_NILE4
bool
diff --git
a/target/linux/ar71xx/patches-4.14/604-MIPS-ath79-no-of.patch
b/target/linux/ar71xx/patches-4.14/604-MIPS-ath79-no-of.patch
index 499145ecd0f89226074415dabf59a16ded2c36e6..5be33f9b08de129eab3b8d99f360a6baf615f3bc 100644
(file)
--- a/
target/linux/ar71xx/patches-4.14/604-MIPS-ath79-no-of.patch
+++ b/
target/linux/ar71xx/patches-4.14/604-MIPS-ath79-no-of.patch
@@
-1,6
+1,6
@@
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
-@@ -20
2,7 +202
,6 @@ config ATH79
+@@ -20
3,7 +203
,6 @@ config ATH79
select SYS_SUPPORTS_BIG_ENDIAN
select SYS_SUPPORTS_MIPS16
select SYS_SUPPORTS_ZBOOT_UART_PROM
select SYS_SUPPORTS_BIG_ENDIAN
select SYS_SUPPORTS_MIPS16
select SYS_SUPPORTS_ZBOOT_UART_PROM
diff --git
a/target/linux/ath25/patches-4.14/107-ar5312_gpio.patch
b/target/linux/ath25/patches-4.14/107-ar5312_gpio.patch
index 9b2bee1d7378723ed772e57ead43c3f9a7b9450f..e74e20b05a4e11de28a129a757166acdefa6047f 100644
(file)
--- a/
target/linux/ath25/patches-4.14/107-ar5312_gpio.patch
+++ b/
target/linux/ath25/patches-4.14/107-ar5312_gpio.patch
@@
-202,7
+202,7
@@
+subsys_initcall(ar5312_gpio_init);
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
+subsys_initcall(ar5312_gpio_init);
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
-@@ -17
4,6 +174
,7 @@ config ATH25
+@@ -17
5,6 +175
,7 @@ config ATH25
select CEVT_R4K
select CSRC_R4K
select DMA_NONCOHERENT
select CEVT_R4K
select CSRC_R4K
select DMA_NONCOHERENT
diff --git
a/target/linux/ath79/patches-4.14/0011-MIPS-ath79-select-the-PINCTRL-subsystem.patch
b/target/linux/ath79/patches-4.14/0011-MIPS-ath79-select-the-PINCTRL-subsystem.patch
index 28782e6c4ead7dab4778d6d1bb0d993c9982b008..c50a473307c9d5a54ae258f38bd76a2202aed5fb 100644
(file)
--- a/
target/linux/ath79/patches-4.14/0011-MIPS-ath79-select-the-PINCTRL-subsystem.patch
+++ b/
target/linux/ath79/patches-4.14/0011-MIPS-ath79-select-the-PINCTRL-subsystem.patch
@@
-14,7
+14,7
@@
Signed-off-by: John Crispin <john@phrozen.org>
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
-@@ -19
1,6 +191
,7 @@ config ATH79
+@@ -19
2,6 +192
,7 @@ config ATH79
select CSRC_R4K
select DMA_NONCOHERENT
select GPIOLIB
select CSRC_R4K
select DMA_NONCOHERENT
select GPIOLIB
diff --git
a/target/linux/ath79/patches-4.14/0028-MIPS-ath79-drop-machfiles.patch
b/target/linux/ath79/patches-4.14/0028-MIPS-ath79-drop-machfiles.patch
index 840967f54561363d62f3bc8dfc8207a4eb0552e8..2d87f700744c5976320ef21f8a5bad290af6a91a 100644
(file)
--- a/
target/linux/ath79/patches-4.14/0028-MIPS-ath79-drop-machfiles.patch
+++ b/
target/linux/ath79/patches-4.14/0028-MIPS-ath79-drop-machfiles.patch
@@
-31,7
+31,7
@@
Signed-off-by: John Crispin <john@phrozen.org>
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
-@@ -19
6,7 +196
,6 @@ config ATH79
+@@ -19
7,7 +197
,6 @@ config ATH79
select COMMON_CLK
select CLKDEV_LOOKUP
select IRQ_MIPS_CPU
select COMMON_CLK
select CLKDEV_LOOKUP
select IRQ_MIPS_CPU
diff --git
a/target/linux/ath79/patches-4.14/0032-MIPS-ath79-sanitize-symbols.patch
b/target/linux/ath79/patches-4.14/0032-MIPS-ath79-sanitize-symbols.patch
index 73c3800f40f4b543c4d4f3dc54ce23f7a2c43968..eaefc0bd214fcdfb9652f663af9f51753f8288cc 100644
(file)
--- a/
target/linux/ath79/patches-4.14/0032-MIPS-ath79-sanitize-symbols.patch
+++ b/
target/linux/ath79/patches-4.14/0032-MIPS-ath79-sanitize-symbols.patch
@@
-15,7
+15,7
@@
Signed-off-by: John Crispin <john@phrozen.org>
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
-@@ -20
2,6 +202
,8 @@ config ATH79
+@@ -20
3,6 +203
,8 @@ config ATH79
select SYS_SUPPORTS_BIG_ENDIAN
select SYS_SUPPORTS_MIPS16
select SYS_SUPPORTS_ZBOOT_UART_PROM
select SYS_SUPPORTS_BIG_ENDIAN
select SYS_SUPPORTS_MIPS16
select SYS_SUPPORTS_ZBOOT_UART_PROM
diff --git
a/target/linux/bcm53xx/patches-4.14/400-mtd-spi-nor-detect-JEDEC-incompatible-w25q128-using-.patch
b/target/linux/bcm53xx/patches-4.14/400-mtd-spi-nor-detect-JEDEC-incompatible-w25q128-using-.patch
index 58cd1bf84daecc206b0ad4fa08bce135c4724555..2eb266446459bdc684a25d41b372ae439204c6bd 100644
(file)
--- a/
target/linux/bcm53xx/patches-4.14/400-mtd-spi-nor-detect-JEDEC-incompatible-w25q128-using-.patch
+++ b/
target/linux/bcm53xx/patches-4.14/400-mtd-spi-nor-detect-JEDEC-incompatible-w25q128-using-.patch
@@
-13,7
+13,7
@@
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
--- a/drivers/mtd/spi-nor/spi-nor.c
+++ b/drivers/mtd/spi-nor/spi-nor.c
--- a/drivers/mtd/spi-nor/spi-nor.c
+++ b/drivers/mtd/spi-nor/spi-nor.c
-@@ -12
15,6 +1215
,18 @@ static const struct flash_info *spi_nor_
+@@ -12
21,6 +1221
,18 @@ static const struct flash_info *spi_nor_
}
dev_err(nor->dev, "unrecognized JEDEC id bytes: %02x, %02x, %02x\n",
id[0], id[1], id[2]);
}
dev_err(nor->dev, "unrecognized JEDEC id bytes: %02x, %02x, %02x\n",
id[0], id[1], id[2]);
diff --git
a/target/linux/brcm63xx/patches-4.14/001-4.15-01-MIPS-BCM63XX-add-clkdev-lookup-support.patch
b/target/linux/brcm63xx/patches-4.14/001-4.15-01-MIPS-BCM63XX-add-clkdev-lookup-support.patch
index 68f64d17bfc03757ab41a349b70c8dc37cf64f9e..b6d755d29bc340b27a3ea9b0e1c0528a1b13a0c3 100644
(file)
--- a/
target/linux/brcm63xx/patches-4.14/001-4.15-01-MIPS-BCM63XX-add-clkdev-lookup-support.patch
+++ b/
target/linux/brcm63xx/patches-4.14/001-4.15-01-MIPS-BCM63XX-add-clkdev-lookup-support.patch
@@
-16,7
+16,7
@@
Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
-@@ -27
8,6 +278
,7 @@ config BCM63XX
+@@ -27
9,6 +279
,7 @@ config BCM63XX
select GPIOLIB
select HAVE_CLK
select MIPS_L1_CACHE_SHIFT_4
select GPIOLIB
select HAVE_CLK
select MIPS_L1_CACHE_SHIFT_4
diff --git
a/target/linux/brcm63xx/patches-4.14/322-MIPS-BCM63XX-switch-to-IRQ_DOMAIN.patch
b/target/linux/brcm63xx/patches-4.14/322-MIPS-BCM63XX-switch-to-IRQ_DOMAIN.patch
index 0e44117a3500b5b29ee06e83609d126ee7d6b45a..d04d89cf62412f42ab1369aedf2589c7fe1414e7 100644
(file)
--- a/
target/linux/brcm63xx/patches-4.14/322-MIPS-BCM63XX-switch-to-IRQ_DOMAIN.patch
+++ b/
target/linux/brcm63xx/patches-4.14/322-MIPS-BCM63XX-switch-to-IRQ_DOMAIN.patch
@@
-14,7
+14,7
@@
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
-@@ -27
1,6 +271
,9 @@ config BCM63XX
+@@ -27
2,6 +272
,9 @@ config BCM63XX
select SYNC_R4K
select DMA_NONCOHERENT
select IRQ_MIPS_CPU
select SYNC_R4K
select DMA_NONCOHERENT
select IRQ_MIPS_CPU
diff --git
a/target/linux/generic/backport-4.14/012-kbuild-add-macro-for-controlling-warnings-to-linux-c.patch
b/target/linux/generic/backport-4.14/012-kbuild-add-macro-for-controlling-warnings-to-linux-c.patch
index 892b65fbc066c858b72d0b7f99eb9db0b6c85767..7617c2e5f554af27e720ddf134d03dadbde4aaf0 100644
(file)
--- a/
target/linux/generic/backport-4.14/012-kbuild-add-macro-for-controlling-warnings-to-linux-c.patch
+++ b/
target/linux/generic/backport-4.14/012-kbuild-add-macro-for-controlling-warnings-to-linux-c.patch
@@
-115,7
+115,7
@@
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
+#endif
--- a/include/linux/compiler_types.h
+++ b/include/linux/compiler_types.h
+#endif
--- a/include/linux/compiler_types.h
+++ b/include/linux/compiler_types.h
-@@ -2
71,4 +271
,22 @@ struct ftrace_likely_data {
+@@ -2
83,4 +283
,22 @@ struct ftrace_likely_data {
# define __native_word(t) (sizeof(t) == sizeof(char) || sizeof(t) == sizeof(short) || sizeof(t) == sizeof(int) || sizeof(t) == sizeof(long))
#endif
# define __native_word(t) (sizeof(t) == sizeof(char) || sizeof(t) == sizeof(short) || sizeof(t) == sizeof(int) || sizeof(t) == sizeof(long))
#endif
diff --git
a/target/linux/generic/backport-4.14/293-v4.16-netfilter-reduce-size-of-hook-entry-point-locations.patch
b/target/linux/generic/backport-4.14/293-v4.16-netfilter-reduce-size-of-hook-entry-point-locations.patch
index 809dab3771d1c080b89c15fa4947d5bf4c78d33c..fcf54e9858da10ef9963e6e204f82581d52e41ac 100644
(file)
--- a/
target/linux/generic/backport-4.14/293-v4.16-netfilter-reduce-size-of-hook-entry-point-locations.patch
+++ b/
target/linux/generic/backport-4.14/293-v4.16-netfilter-reduce-size-of-hook-entry-point-locations.patch
@@
-92,7
+92,7
@@
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
#endif
--- a/net/bridge/br_netfilter_hooks.c
+++ b/net/bridge/br_netfilter_hooks.c
#endif
--- a/net/bridge/br_netfilter_hooks.c
+++ b/net/bridge/br_netfilter_hooks.c
-@@ -99
1,7 +991
,7 @@ int br_nf_hook_thresh(unsigned int hook,
+@@ -99
2,7 +992
,7 @@ int br_nf_hook_thresh(unsigned int hook,
unsigned int i;
int ret;
unsigned int i;
int ret;
diff --git
a/target/linux/generic/hack-4.14/220-gc_sections.patch
b/target/linux/generic/hack-4.14/220-gc_sections.patch
index 79fdb6e8014fa0a8cbe6d6411eac26d4648411ff..fd53dbd40d6ade8921bd29651391360fe926d8c7 100644
(file)
--- a/
target/linux/generic/hack-4.14/220-gc_sections.patch
+++ b/
target/linux/generic/hack-4.14/220-gc_sections.patch
@@
-171,7
+171,7
@@
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
.init.data : {
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
.init.data : {
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
-@@ -
39,6 +39
,7 @@ config MIPS
+@@ -
40,6 +40
,7 @@ config MIPS
select HAVE_CBPF_JIT if (!64BIT && !CPU_MICROMIPS)
select HAVE_EBPF_JIT if (64BIT && !CPU_MICROMIPS)
select HAVE_CC_STACKPROTECTOR
select HAVE_CBPF_JIT if (!64BIT && !CPU_MICROMIPS)
select HAVE_EBPF_JIT if (64BIT && !CPU_MICROMIPS)
select HAVE_CC_STACKPROTECTOR
diff --git
a/target/linux/generic/hack-4.14/301-mips_image_cmdline_hack.patch
b/target/linux/generic/hack-4.14/301-mips_image_cmdline_hack.patch
index 01caff5b89e87849282b3224d197f6cc692ff03d..eb6011e813da60183877379b5c08c622c5cf5fa6 100644
(file)
--- a/
target/linux/generic/hack-4.14/301-mips_image_cmdline_hack.patch
+++ b/
target/linux/generic/hack-4.14/301-mips_image_cmdline_hack.patch
@@
-10,7
+10,7
@@
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
-@@ -115
7,6 +1157
,10 @@ config SYNC_R4K
+@@ -115
8,6 +1158
,10 @@ config SYNC_R4K
config MIPS_MACHINE
def_bool n
config MIPS_MACHINE
def_bool n
diff --git
a/target/linux/generic/hack-4.14/661-use_fq_codel_by_default.patch
b/target/linux/generic/hack-4.14/661-use_fq_codel_by_default.patch
index d1e92ae40af4cb12a66a4d063833396ddf2b374e..8007e28301e8cabb4c93cbe32cf5c899543fb307 100644
(file)
--- a/
target/linux/generic/hack-4.14/661-use_fq_codel_by_default.patch
+++ b/
target/linux/generic/hack-4.14/661-use_fq_codel_by_default.patch
@@
-44,7
+44,7
@@
Signed-off-by: Felix Fietkau <nbd@nbd.name>
device, it has to decide which ones to send first, which ones to
--- a/net/sched/sch_api.c
+++ b/net/sched/sch_api.c
device, it has to decide which ones to send first, which ones to
--- a/net/sched/sch_api.c
+++ b/net/sched/sch_api.c
-@@ -202
8,7 +2028
,7 @@ static int __init pktsched_init(void)
+@@ -202
9,7 +2029
,7 @@ static int __init pktsched_init(void)
return err;
}
return err;
}
diff --git
a/target/linux/generic/pending-4.14/201-extra_optimization.patch
b/target/linux/generic/pending-4.14/201-extra_optimization.patch
index 3c3353c7d16e147a462eed0194e3fac031f99fd7..42cd7f158528df923e6eaffc5a3c0cf000c952c6 100644
(file)
--- a/
target/linux/generic/pending-4.14/201-extra_optimization.patch
+++ b/
target/linux/generic/pending-4.14/201-extra_optimization.patch
@@
-14,7
+14,7
@@
Signed-off-by: Felix Fietkau <nbd@nbd.name>
--- a/Makefile
+++ b/Makefile
--- a/Makefile
+++ b/Makefile
-@@ -65
0,12 +650
,12 @@ KBUILD_CFLAGS += $(call cc-disable-warni
+@@ -65
2,12 +652
,12 @@ KBUILD_CFLAGS += $(call cc-disable-warni
ifdef CONFIG_CC_OPTIMIZE_FOR_SIZE
KBUILD_CFLAGS += $(call cc-option,-Oz,-Os)
ifdef CONFIG_CC_OPTIMIZE_FOR_SIZE
KBUILD_CFLAGS += $(call cc-option,-Oz,-Os)
diff --git
a/target/linux/generic/pending-4.14/300-mips_expose_boot_raw.patch
b/target/linux/generic/pending-4.14/300-mips_expose_boot_raw.patch
index 9419e9916bbb6c83cff23b30e8a7fd55014ce02a..5384be15ca02e4c77c2f762d00626c2454b8d613 100644
(file)
--- a/
target/linux/generic/pending-4.14/300-mips_expose_boot_raw.patch
+++ b/
target/linux/generic/pending-4.14/300-mips_expose_boot_raw.patch
@@
-9,7
+9,7
@@
Acked-by: Rob Landley <rob@landley.net>
---
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
---
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
-@@ -106
6,9 +1066
,6 @@ config FW_ARC
+@@ -106
7,9 +1067
,6 @@ config FW_ARC
config ARCH_MAY_HAVE_PC_FDC
bool
config ARCH_MAY_HAVE_PC_FDC
bool
@@
-19,7
+19,7
@@
Acked-by: Rob Landley <rob@landley.net>
config CEVT_BCM1480
bool
config CEVT_BCM1480
bool
-@@ -296
6,6 +2963
,18 @@ choice
+@@ -296
7,6 +2964
,18 @@ choice
bool "Extend builtin kernel arguments with bootloader arguments"
endchoice
bool "Extend builtin kernel arguments with bootloader arguments"
endchoice
diff --git
a/target/linux/generic/pending-4.14/304-mips_disable_fpu.patch
b/target/linux/generic/pending-4.14/304-mips_disable_fpu.patch
index 1cfd3d7d7a9b0ef330d5f9bd0167fb578dbbf714..22e2e86206c191275c38ccba6dd922a1f75779aa 100644
(file)
--- a/
target/linux/generic/pending-4.14/304-mips_disable_fpu.patch
+++ b/
target/linux/generic/pending-4.14/304-mips_disable_fpu.patch
@@
-24,7
+24,7
@@
v2: incorporated changes suggested by Jonas Gorski
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
-@@ -289
0,6 +2890
,20 @@ config MIPS_O32_FP64_SUPPORT
+@@ -289
1,6 +2891
,20 @@ config MIPS_O32_FP64_SUPPORT
If unsure, say N.
If unsure, say N.
diff --git
a/target/linux/generic/pending-4.14/341-MIPS-mm-remove-no-op-dma_map_ops-where-possible.patch
b/target/linux/generic/pending-4.14/341-MIPS-mm-remove-no-op-dma_map_ops-where-possible.patch
index 3cd87861a4e1ba0886c0b7d7ff210dc25b8cebdb..de2dd65b1795c7f74021fe5eac61363d51755ec5 100644
(file)
--- a/
target/linux/generic/pending-4.14/341-MIPS-mm-remove-no-op-dma_map_ops-where-possible.patch
+++ b/
target/linux/generic/pending-4.14/341-MIPS-mm-remove-no-op-dma_map_ops-where-possible.patch
@@
-14,7
+14,7
@@
Signed-off-by: Felix Fietkau <nbd@nbd.name>
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
-@@ -22
0,6 +220
,7 @@ config BMIPS_GENERIC
+@@ -22
1,6 +221
,7 @@ config BMIPS_GENERIC
select BRCMSTB_L2_IRQ
select IRQ_MIPS_CPU
select DMA_NONCOHERENT
select BRCMSTB_L2_IRQ
select IRQ_MIPS_CPU
select DMA_NONCOHERENT
@@
-22,7
+22,7
@@
Signed-off-by: Felix Fietkau <nbd@nbd.name>
select SYS_SUPPORTS_32BIT_KERNEL
select SYS_SUPPORTS_LITTLE_ENDIAN
select SYS_SUPPORTS_BIG_ENDIAN
select SYS_SUPPORTS_32BIT_KERNEL
select SYS_SUPPORTS_LITTLE_ENDIAN
select SYS_SUPPORTS_BIG_ENDIAN
-@@ -34
5,6 +346
,7 @@ config MACH_JAZZ
+@@ -34
6,6 +347
,7 @@ config MACH_JAZZ
select CSRC_R4K
select DEFAULT_SGI_PARTITION if CPU_BIG_ENDIAN
select GENERIC_ISA_DMA
select CSRC_R4K
select DEFAULT_SGI_PARTITION if CPU_BIG_ENDIAN
select GENERIC_ISA_DMA
@@
-30,7
+30,7
@@
Signed-off-by: Felix Fietkau <nbd@nbd.name>
select HAVE_PCSPKR_PLATFORM
select IRQ_MIPS_CPU
select I8253
select HAVE_PCSPKR_PLATFORM
select IRQ_MIPS_CPU
select I8253
-@@ -112
7,6 +1129
,9 @@ config DMA_NONCOHERENT
+@@ -112
8,6 +1130
,9 @@ config DMA_NONCOHERENT
bool
select NEED_DMA_MAP_STATE
bool
select NEED_DMA_MAP_STATE
@@
-40,7
+40,7
@@
Signed-off-by: Felix Fietkau <nbd@nbd.name>
config NEED_DMA_MAP_STATE
bool
config NEED_DMA_MAP_STATE
bool
-@@ -165
1,6 +1656
,7 @@ config CPU_R10000
+@@ -165
2,6 +1657
,7 @@ config CPU_R10000
select CPU_SUPPORTS_64BIT_KERNEL
select CPU_SUPPORTS_HIGHMEM
select CPU_SUPPORTS_HUGEPAGES
select CPU_SUPPORTS_64BIT_KERNEL
select CPU_SUPPORTS_HIGHMEM
select CPU_SUPPORTS_HUGEPAGES
@@
-48,7
+48,7
@@
Signed-off-by: Felix Fietkau <nbd@nbd.name>
help
MIPS Technologies R10000-series processors.
help
MIPS Technologies R10000-series processors.
-@@ -1
899,9 +1905
,11 @@ config SYS_HAS_CPU_MIPS32_R3_5
+@@ -1
900,9 +1906
,11 @@ config SYS_HAS_CPU_MIPS32_R3_5
bool
config SYS_HAS_CPU_MIPS32_R5
bool
config SYS_HAS_CPU_MIPS32_R5
@@
-60,7
+60,7
@@
Signed-off-by: Felix Fietkau <nbd@nbd.name>
bool
config SYS_HAS_CPU_MIPS64_R1
bool
config SYS_HAS_CPU_MIPS64_R1
-@@ -191
1,6 +1919
,7 @@ config SYS_HAS_CPU_MIPS64_R2
+@@ -191
2,6 +1920
,7 @@ config SYS_HAS_CPU_MIPS64_R2
bool
config SYS_HAS_CPU_MIPS64_R6
bool
config SYS_HAS_CPU_MIPS64_R6
diff --git
a/target/linux/generic/pending-4.14/450-mtd-spi-nor-allow-NOR-driver-to-write-fewer-bytes-th.patch
b/target/linux/generic/pending-4.14/450-mtd-spi-nor-allow-NOR-driver-to-write-fewer-bytes-th.patch
index 50ed2be3d776aa53dcd23e270f03b5737ff8bfd4..571c9b885f3e6cb5ee4361a420071f1fb5c49a1a 100644
(file)
--- a/
target/linux/generic/pending-4.14/450-mtd-spi-nor-allow-NOR-driver-to-write-fewer-bytes-th.patch
+++ b/
target/linux/generic/pending-4.14/450-mtd-spi-nor-allow-NOR-driver-to-write-fewer-bytes-th.patch
@@
-11,7
+11,7
@@
Signed-off-by: Felix Fietkau <nbd@nbd.name>
--- a/drivers/mtd/spi-nor/spi-nor.c
+++ b/drivers/mtd/spi-nor/spi-nor.c
--- a/drivers/mtd/spi-nor/spi-nor.c
+++ b/drivers/mtd/spi-nor/spi-nor.c
-@@ -137
1,7 +1371
,7 @@ static int spi_nor_write(struct mtd_info
+@@ -137
7,7 +1377
,7 @@ static int spi_nor_write(struct mtd_info
write_enable(nor);
ret = nor->write(nor, addr, page_remain, buf + i);
write_enable(nor);
ret = nor->write(nor, addr, page_remain, buf + i);
@@
-20,7
+20,7
@@
Signed-off-by: Felix Fietkau <nbd@nbd.name>
goto write_err;
written = ret;
goto write_err;
written = ret;
-@@ -138
0,13 +1380
,6 @@ static int spi_nor_write(struct mtd_info
+@@ -138
6,13 +1386
,6 @@ static int spi_nor_write(struct mtd_info
goto write_err;
*retlen += written;
i += written;
goto write_err;
*retlen += written;
i += written;
diff --git
a/target/linux/generic/pending-4.14/465-m25p80-mx-disable-software-protection.patch
b/target/linux/generic/pending-4.14/465-m25p80-mx-disable-software-protection.patch
index dc71e9d5427dd90a98cd2ec8f340db39c11d3019..b41710276fff4049d9cd910b784e7c69d1c14f47 100644
(file)
--- a/
target/linux/generic/pending-4.14/465-m25p80-mx-disable-software-protection.patch
+++ b/
target/linux/generic/pending-4.14/465-m25p80-mx-disable-software-protection.patch
@@
-8,7
+8,7
@@
Signed-off-by: Felix Fietkau <nbd@nbd.name>
--- a/drivers/mtd/spi-nor/spi-nor.c
+++ b/drivers/mtd/spi-nor/spi-nor.c
--- a/drivers/mtd/spi-nor/spi-nor.c
+++ b/drivers/mtd/spi-nor/spi-nor.c
-@@ -27
08,6 +2708
,7 @@ int spi_nor_scan(struct spi_nor *nor, co
+@@ -27
14,6 +2714
,7 @@ int spi_nor_scan(struct spi_nor *nor, co
if (JEDEC_MFR(info) == SNOR_MFR_ATMEL ||
JEDEC_MFR(info) == SNOR_MFR_INTEL ||
if (JEDEC_MFR(info) == SNOR_MFR_ATMEL ||
JEDEC_MFR(info) == SNOR_MFR_INTEL ||
diff --git
a/target/linux/generic/pending-4.14/466-Revert-mtd-spi-nor-fix-Spansion-regressions-aliased-.patch
b/target/linux/generic/pending-4.14/466-Revert-mtd-spi-nor-fix-Spansion-regressions-aliased-.patch
index fc5cf6232400e6c685054ed69969e697d81318da..55d9709761c7c6d3e2bb722256db9e3f18871f17 100644
(file)
--- a/
target/linux/generic/pending-4.14/466-Revert-mtd-spi-nor-fix-Spansion-regressions-aliased-.patch
+++ b/
target/linux/generic/pending-4.14/466-Revert-mtd-spi-nor-fix-Spansion-regressions-aliased-.patch
@@
-17,7
+17,7
@@
Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
--- a/drivers/mtd/spi-nor/spi-nor.c
+++ b/drivers/mtd/spi-nor/spi-nor.c
--- a/drivers/mtd/spi-nor/spi-nor.c
+++ b/drivers/mtd/spi-nor/spi-nor.c
-@@ -271
0,6 +2710
,7 @@ int spi_nor_scan(struct spi_nor *nor, co
+@@ -271
6,6 +2716
,7 @@ int spi_nor_scan(struct spi_nor *nor, co
JEDEC_MFR(info) == SNOR_MFR_INTEL ||
JEDEC_MFR(info) == SNOR_MFR_MACRONIX ||
JEDEC_MFR(info) == SNOR_MFR_SST ||
JEDEC_MFR(info) == SNOR_MFR_INTEL ||
JEDEC_MFR(info) == SNOR_MFR_MACRONIX ||
JEDEC_MFR(info) == SNOR_MFR_SST ||
@@
-25,7
+25,7
@@
Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
info->flags & SPI_NOR_HAS_LOCK) {
write_enable(nor);
write_sr(nor, 0);
info->flags & SPI_NOR_HAS_LOCK) {
write_enable(nor);
write_sr(nor, 0);
-@@ -27
28,7 +2729
,8 @@ int spi_nor_scan(struct spi_nor *nor, co
+@@ -27
34,7 +2735
,8 @@ int spi_nor_scan(struct spi_nor *nor, co
/* NOR protection support for STmicro/Micron chips and similar */
if (JEDEC_MFR(info) == SNOR_MFR_MICRON ||
/* NOR protection support for STmicro/Micron chips and similar */
if (JEDEC_MFR(info) == SNOR_MFR_MICRON ||
diff --git
a/target/linux/generic/pending-4.14/470-mtd-spi-nor-support-limiting-4K-sectors-support-base.patch
b/target/linux/generic/pending-4.14/470-mtd-spi-nor-support-limiting-4K-sectors-support-base.patch
index 88775041ce89c4b259d47805d81cd0064bfc2d99..231f9c21a4e2394a6db5f6514274cc1cdab9648d 100644
(file)
--- a/
target/linux/generic/pending-4.14/470-mtd-spi-nor-support-limiting-4K-sectors-support-base.patch
+++ b/
target/linux/generic/pending-4.14/470-mtd-spi-nor-support-limiting-4K-sectors-support-base.patch
@@
-39,7
+39,7
@@
Signed-off-by: Felix Fietkau <nbd@nbd.name>
depends on ARCH_AT91 || (ARM && COMPILE_TEST)
--- a/drivers/mtd/spi-nor/spi-nor.c
+++ b/drivers/mtd/spi-nor/spi-nor.c
depends on ARCH_AT91 || (ARM && COMPILE_TEST)
--- a/drivers/mtd/spi-nor/spi-nor.c
+++ b/drivers/mtd/spi-nor/spi-nor.c
-@@ -25
55,10 +2555
,12 @@ static int spi_nor_select_erase(struct s
+@@ -25
61,10 +2561
,12 @@ static int spi_nor_select_erase(struct s
#ifdef CONFIG_MTD_SPI_NOR_USE_4K_SECTORS
/* prefer "small sector" erase if possible */
#ifdef CONFIG_MTD_SPI_NOR_USE_4K_SECTORS
/* prefer "small sector" erase if possible */
diff --git
a/target/linux/generic/pending-4.14/475-mtd-spi-nor-Add-Winbond-w25q128jv-support.patch
b/target/linux/generic/pending-4.14/475-mtd-spi-nor-Add-Winbond-w25q128jv-support.patch
index e3cc699e425bbaa9f90129cf15aa72bd5e49ea29..f751bfd3b2488a901233028e627873a2ef7c26bb 100644
(file)
--- a/
target/linux/generic/pending-4.14/475-mtd-spi-nor-Add-Winbond-w25q128jv-support.patch
+++ b/
target/linux/generic/pending-4.14/475-mtd-spi-nor-Add-Winbond-w25q128jv-support.patch
@@
-20,7
+20,7
@@
Changes in v2:
--- a/drivers/mtd/spi-nor/spi-nor.c
+++ b/drivers/mtd/spi-nor/spi-nor.c
--- a/drivers/mtd/spi-nor/spi-nor.c
+++ b/drivers/mtd/spi-nor/spi-nor.c
-@@ -11
59,6 +1159
,11 @@ static const struct flash_info spi_nor_i
+@@ -11
65,6 +1165
,11 @@ static const struct flash_info spi_nor_i
SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ |
SPI_NOR_HAS_LOCK | SPI_NOR_HAS_TB)
},
SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ |
SPI_NOR_HAS_LOCK | SPI_NOR_HAS_TB)
},
diff --git
a/target/linux/generic/pending-4.14/477-mtd-add-spi-nor-add-mx25u3235f.patch
b/target/linux/generic/pending-4.14/477-mtd-add-spi-nor-add-mx25u3235f.patch
index 191e01df7a50a85bd13e237684a58be45260ee24..2d94959c5c0f22edd90696b87bd19623be9baa90 100644
(file)
--- a/
target/linux/generic/pending-4.14/477-mtd-add-spi-nor-add-mx25u3235f.patch
+++ b/
target/linux/generic/pending-4.14/477-mtd-add-spi-nor-add-mx25u3235f.patch
@@
-8,7
+8,7
@@
Signed-off-by: André Valentin <avalentin@marcant.net>
--- a/drivers/mtd/spi-nor/spi-nor.c
+++ b/drivers/mtd/spi-nor/spi-nor.c
--- a/drivers/mtd/spi-nor/spi-nor.c
+++ b/drivers/mtd/spi-nor/spi-nor.c
-@@ -10
16,6 +1016
,7 @@ static const struct flash_info spi_nor_i
+@@ -10
22,6 +1022
,7 @@ static const struct flash_info spi_nor_i
{ "mx25l3205d", INFO(0xc22016, 0, 64 * 1024, 64, SECT_4K) },
{ "mx25l3255e", INFO(0xc29e16, 0, 64 * 1024, 64, SECT_4K) },
{ "mx25l6405d", INFO(0xc22017, 0, 64 * 1024, 128, SECT_4K) },
{ "mx25l3205d", INFO(0xc22016, 0, 64 * 1024, 64, SECT_4K) },
{ "mx25l3255e", INFO(0xc29e16, 0, 64 * 1024, 64, SECT_4K) },
{ "mx25l6405d", INFO(0xc22017, 0, 64 * 1024, 128, SECT_4K) },
diff --git
a/target/linux/generic/pending-4.14/478-mtd-spi-nor-Add-support-for-XM25QH64A-and-XM25QH128A.patch
b/target/linux/generic/pending-4.14/478-mtd-spi-nor-Add-support-for-XM25QH64A-and-XM25QH128A.patch
index 69bade0cf89517e71caddbdf8d18fbfc16974703..4ecf53621d3084bdae7f0b8a2e6ca9289f3184d3 100644
(file)
--- a/
target/linux/generic/pending-4.14/478-mtd-spi-nor-Add-support-for-XM25QH64A-and-XM25QH128A.patch
+++ b/
target/linux/generic/pending-4.14/478-mtd-spi-nor-Add-support-for-XM25QH64A-and-XM25QH128A.patch
@@
-17,7
+17,7
@@
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
--- a/drivers/mtd/spi-nor/spi-nor.c
+++ b/drivers/mtd/spi-nor/spi-nor.c
--- a/drivers/mtd/spi-nor/spi-nor.c
+++ b/drivers/mtd/spi-nor/spi-nor.c
-@@ -11
86,6 +1186
,10 @@ static const struct flash_info spi_nor_i
+@@ -11
92,6 +1192
,10 @@ static const struct flash_info spi_nor_i
{ "3S400AN", S3AN_INFO(0x1f2400, 256, 264) },
{ "3S700AN", S3AN_INFO(0x1f2500, 512, 264) },
{ "3S1400AN", S3AN_INFO(0x1f2600, 512, 528) },
{ "3S400AN", S3AN_INFO(0x1f2400, 256, 264) },
{ "3S700AN", S3AN_INFO(0x1f2500, 512, 264) },
{ "3S1400AN", S3AN_INFO(0x1f2600, 512, 528) },
diff --git
a/target/linux/generic/pending-4.14/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch
b/target/linux/generic/pending-4.14/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch
index 0b46ed9e47b8009ab12d2e77ffddb8c995f6d5e2..7c60d7e79998db95d2161048af65bceb225b9990 100644
(file)
--- a/
target/linux/generic/pending-4.14/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch
+++ b/
target/linux/generic/pending-4.14/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch
@@
-300,7
+300,7
@@
Signed-off-by: Steven Barth <cyrus@openwrt.org>
/**
* ip6_tnl_addr_conflict - compare packet addresses to tunnel's own
* @t: the outgoing tunnel device
/**
* ip6_tnl_addr_conflict - compare packet addresses to tunnel's own
* @t: the outgoing tunnel device
-@@ -130
4,6 +1444
,7 @@ ip6ip6_tnl_xmit(struct sk_buff *skb, str
+@@ -130
5,6 +1445
,7 @@ ip6ip6_tnl_xmit(struct sk_buff *skb, str
{
struct ip6_tnl *t = netdev_priv(dev);
struct ipv6hdr *ipv6h;
{
struct ip6_tnl *t = netdev_priv(dev);
struct ipv6hdr *ipv6h;
@@
-308,7
+308,7
@@
Signed-off-by: Steven Barth <cyrus@openwrt.org>
int encap_limit = -1;
__u16 offset;
struct flowi6 fl6;
int encap_limit = -1;
__u16 offset;
struct flowi6 fl6;
-@@ -137
0,6 +1511
,18 @@ ip6ip6_tnl_xmit(struct sk_buff *skb, str
+@@ -137
1,6 +1512
,18 @@ ip6ip6_tnl_xmit(struct sk_buff *skb, str
fl6.flowi6_uid = sock_net_uid(dev_net(dev), NULL);
fl6.flowi6_uid = sock_net_uid(dev_net(dev), NULL);
@@
-327,7
+327,7
@@
Signed-off-by: Steven Barth <cyrus@openwrt.org>
if (iptunnel_handle_offloads(skb, SKB_GSO_IPXIP6))
return -1;
if (iptunnel_handle_offloads(skb, SKB_GSO_IPXIP6))
return -1;
-@@ -149
8,6 +1651
,14 @@ ip6_tnl_change(struct ip6_tnl *t, const
+@@ -149
9,6 +1652
,14 @@ ip6_tnl_change(struct ip6_tnl *t, const
t->parms.link = p->link;
t->parms.proto = p->proto;
t->parms.fwmark = p->fwmark;
t->parms.link = p->link;
t->parms.proto = p->proto;
t->parms.fwmark = p->fwmark;
@@
-342,7
+342,7
@@
Signed-off-by: Steven Barth <cyrus@openwrt.org>
dst_cache_reset(&t->dst_cache);
ip6_tnl_link_config(t);
return 0;
dst_cache_reset(&t->dst_cache);
ip6_tnl_link_config(t);
return 0;
-@@ -153
6,6 +1697
,7 @@ ip6_tnl_parm_from_user(struct __ip6_tnl_
+@@ -153
7,6 +1698
,7 @@ ip6_tnl_parm_from_user(struct __ip6_tnl_
p->flowinfo = u->flowinfo;
p->link = u->link;
p->proto = u->proto;
p->flowinfo = u->flowinfo;
p->link = u->link;
p->proto = u->proto;
@@
-350,7
+350,7
@@
Signed-off-by: Steven Barth <cyrus@openwrt.org>
memcpy(p->name, u->name, sizeof(u->name));
}
memcpy(p->name, u->name, sizeof(u->name));
}
-@@ -192
2,6 +2084
,15 @@ static int ip6_tnl_validate(struct nlatt
+@@ -192
3,6 +2085
,15 @@ static int ip6_tnl_validate(struct nlatt
return 0;
}
return 0;
}
@@
-366,7
+366,7
@@
Signed-off-by: Steven Barth <cyrus@openwrt.org>
static void ip6_tnl_netlink_parms(struct nlattr *data[],
struct __ip6_tnl_parm *parms)
{
static void ip6_tnl_netlink_parms(struct nlattr *data[],
struct __ip6_tnl_parm *parms)
{
-@@ -19
59,6 +2130
,46 @@ static void ip6_tnl_netlink_parms(struct
+@@ -19
60,6 +2131
,46 @@ static void ip6_tnl_netlink_parms(struct
if (data[IFLA_IPTUN_FWMARK])
parms->fwmark = nla_get_u32(data[IFLA_IPTUN_FWMARK]);
if (data[IFLA_IPTUN_FWMARK])
parms->fwmark = nla_get_u32(data[IFLA_IPTUN_FWMARK]);
@@
-413,7
+413,7
@@
Signed-off-by: Steven Barth <cyrus@openwrt.org>
}
static bool ip6_tnl_netlink_encap_parms(struct nlattr *data[],
}
static bool ip6_tnl_netlink_encap_parms(struct nlattr *data[],
-@@ -207
4,6 +2285
,12 @@ static void ip6_tnl_dellink(struct net_d
+@@ -207
5,6 +2286
,12 @@ static void ip6_tnl_dellink(struct net_d
static size_t ip6_tnl_get_size(const struct net_device *dev)
{
static size_t ip6_tnl_get_size(const struct net_device *dev)
{
@@
-426,7
+426,7
@@
Signed-off-by: Steven Barth <cyrus@openwrt.org>
return
/* IFLA_IPTUN_LINK */
nla_total_size(4) +
return
/* IFLA_IPTUN_LINK */
nla_total_size(4) +
-@@ -210
3,6 +2320
,24 @@ static size_t ip6_tnl_get_size(const str
+@@ -210
4,6 +2321
,24 @@ static size_t ip6_tnl_get_size(const str
nla_total_size(0) +
/* IFLA_IPTUN_FWMARK */
nla_total_size(4) +
nla_total_size(0) +
/* IFLA_IPTUN_FWMARK */
nla_total_size(4) +
@@
-451,7
+451,7
@@
Signed-off-by: Steven Barth <cyrus@openwrt.org>
0;
}
0;
}
-@@ -211
0,6 +2345
,9 @@ static int ip6_tnl_fill_info(struct sk_b
+@@ -211
1,6 +2346
,9 @@ static int ip6_tnl_fill_info(struct sk_b
{
struct ip6_tnl *tunnel = netdev_priv(dev);
struct __ip6_tnl_parm *parm = &tunnel->parms;
{
struct ip6_tnl *tunnel = netdev_priv(dev);
struct __ip6_tnl_parm *parm = &tunnel->parms;
@@
-461,7
+461,7
@@
Signed-off-by: Steven Barth <cyrus@openwrt.org>
if (nla_put_u32(skb, IFLA_IPTUN_LINK, parm->link) ||
nla_put_in6_addr(skb, IFLA_IPTUN_LOCAL, &parm->laddr) ||
if (nla_put_u32(skb, IFLA_IPTUN_LINK, parm->link) ||
nla_put_in6_addr(skb, IFLA_IPTUN_LOCAL, &parm->laddr) ||
-@@ -21
19,9 +2357
,27 @@ static int ip6_tnl_fill_info(struct sk_b
+@@ -21
20,9 +2358
,27 @@ static int ip6_tnl_fill_info(struct sk_b
nla_put_be32(skb, IFLA_IPTUN_FLOWINFO, parm->flowinfo) ||
nla_put_u32(skb, IFLA_IPTUN_FLAGS, parm->flags) ||
nla_put_u8(skb, IFLA_IPTUN_PROTO, parm->proto) ||
nla_put_be32(skb, IFLA_IPTUN_FLOWINFO, parm->flowinfo) ||
nla_put_u32(skb, IFLA_IPTUN_FLAGS, parm->flags) ||
nla_put_u8(skb, IFLA_IPTUN_PROTO, parm->proto) ||
@@
-490,7
+490,7
@@
Signed-off-by: Steven Barth <cyrus@openwrt.org>
if (nla_put_u16(skb, IFLA_IPTUN_ENCAP_TYPE, tunnel->encap.type) ||
nla_put_be16(skb, IFLA_IPTUN_ENCAP_SPORT, tunnel->encap.sport) ||
nla_put_be16(skb, IFLA_IPTUN_ENCAP_DPORT, tunnel->encap.dport) ||
if (nla_put_u16(skb, IFLA_IPTUN_ENCAP_TYPE, tunnel->encap.type) ||
nla_put_be16(skb, IFLA_IPTUN_ENCAP_SPORT, tunnel->encap.sport) ||
nla_put_be16(skb, IFLA_IPTUN_ENCAP_DPORT, tunnel->encap.dport) ||
-@@ -216
1,6 +2417
,7 @@ static const struct nla_policy ip6_tnl_p
+@@ -216
2,6 +2418
,7 @@ static const struct nla_policy ip6_tnl_p
[IFLA_IPTUN_ENCAP_DPORT] = { .type = NLA_U16 },
[IFLA_IPTUN_COLLECT_METADATA] = { .type = NLA_FLAG },
[IFLA_IPTUN_FWMARK] = { .type = NLA_U32 },
[IFLA_IPTUN_ENCAP_DPORT] = { .type = NLA_U16 },
[IFLA_IPTUN_COLLECT_METADATA] = { .type = NLA_FLAG },
[IFLA_IPTUN_FWMARK] = { .type = NLA_U32 },
diff --git
a/target/linux/generic/pending-4.14/701-phy_extension.patch
b/target/linux/generic/pending-4.14/701-phy_extension.patch
index 1b380e24a9aa437534560442bde18467ba98f384..0f0b0e046777d7ccc0b7d9cbf3a59179724c4acd 100644
(file)
--- a/
target/linux/generic/pending-4.14/701-phy_extension.patch
+++ b/
target/linux/generic/pending-4.14/701-phy_extension.patch
@@
-85,7
+85,7
@@
Signed-off-by: John Crispin <john@phrozen.org>
* @phydev: the phy_device struct
--- a/include/linux/phy.h
+++ b/include/linux/phy.h
* @phydev: the phy_device struct
--- a/include/linux/phy.h
+++ b/include/linux/phy.h
-@@ -90
5,6 +905
,7 @@ void phy_ethtool_ksettings_get(struct ph
+@@ -90
9,6 +909
,7 @@ void phy_ethtool_ksettings_get(struct ph
struct ethtool_link_ksettings *cmd);
int phy_ethtool_ksettings_set(struct phy_device *phydev,
const struct ethtool_link_ksettings *cmd);
struct ethtool_link_ksettings *cmd);
int phy_ethtool_ksettings_set(struct phy_device *phydev,
const struct ethtool_link_ksettings *cmd);
diff --git
a/target/linux/ipq40xx/patches-4.14/303-spi-nor-enable-4B-opcodes-for-mx25l25635f.patch
b/target/linux/ipq40xx/patches-4.14/303-spi-nor-enable-4B-opcodes-for-mx25l25635f.patch
index 7d1514a5c33d991c48166da2ea0e10ee7412e5d5..056361eb46ca877420103b38701a9c2dd03706a8 100644
(file)
--- a/
target/linux/ipq40xx/patches-4.14/303-spi-nor-enable-4B-opcodes-for-mx25l25635f.patch
+++ b/
target/linux/ipq40xx/patches-4.14/303-spi-nor-enable-4B-opcodes-for-mx25l25635f.patch
@@
-1,6
+1,6
@@
--- a/drivers/mtd/spi-nor/spi-nor.c
+++ b/drivers/mtd/spi-nor/spi-nor.c
--- a/drivers/mtd/spi-nor/spi-nor.c
+++ b/drivers/mtd/spi-nor/spi-nor.c
-@@ -10
25,6 +1025
,7 @@ static const struct flash_info spi_nor_i
+@@ -10
31,6 +1031
,7 @@ static const struct flash_info spi_nor_i
{ "mx25l12805d", INFO(0xc22018, 0, 64 * 1024, 256, 0) },
{ "mx25l12855e", INFO(0xc22618, 0, 64 * 1024, 256, 0) },
{ "mx25l25635e", INFO(0xc22019, 0, 64 * 1024, 512, SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
{ "mx25l12805d", INFO(0xc22018, 0, 64 * 1024, 256, 0) },
{ "mx25l12855e", INFO(0xc22618, 0, 64 * 1024, 256, 0) },
{ "mx25l25635e", INFO(0xc22019, 0, 64 * 1024, 512, SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
@@
-8,7
+8,7
@@
{ "mx25u25635f", INFO(0xc22539, 0, 64 * 1024, 512, SECT_4K | SPI_NOR_4B_OPCODES) },
{ "mx25l25655e", INFO(0xc22619, 0, 64 * 1024, 512, 0) },
{ "mx66l51235l", INFO(0xc2201a, 0, 64 * 1024, 1024, SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
{ "mx25u25635f", INFO(0xc22539, 0, 64 * 1024, 512, SECT_4K | SPI_NOR_4B_OPCODES) },
{ "mx25l25655e", INFO(0xc22619, 0, 64 * 1024, 512, 0) },
{ "mx66l51235l", INFO(0xc2201a, 0, 64 * 1024, 1024, SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
-@@ -1
194,11 +1195
,12 @@ static const struct flash_info spi_nor_i
+@@ -1
200,11 +1201
,12 @@ static const struct flash_info spi_nor_i
{ },
};
{ },
};
@@
-23,7
+23,7
@@
tmp = nor->read_reg(nor, SPINOR_OP_RDID, id, SPI_NOR_MAX_ID_LEN);
if (tmp < 0) {
tmp = nor->read_reg(nor, SPINOR_OP_RDID, id, SPI_NOR_MAX_ID_LEN);
if (tmp < 0) {
-@@ -12
09,10 +1211
,16 @@ static const struct flash_info *spi_nor_
+@@ -12
15,10 +1217
,16 @@ static const struct flash_info *spi_nor_
for (tmp = 0; tmp < ARRAY_SIZE(spi_nor_ids) - 1; tmp++) {
info = &spi_nor_ids[tmp];
if (info->id_len) {
for (tmp = 0; tmp < ARRAY_SIZE(spi_nor_ids) - 1; tmp++) {
info = &spi_nor_ids[tmp];
if (info->id_len) {
@@
-42,7
+42,7
@@
dev_err(nor->dev, "unrecognized JEDEC id bytes: %02x, %02x, %02x\n",
id[0], id[1], id[2]);
return ERR_PTR(-ENODEV);
dev_err(nor->dev, "unrecognized JEDEC id bytes: %02x, %02x, %02x\n",
id[0], id[1], id[2]);
return ERR_PTR(-ENODEV);
-@@ -267
2,7 +2680
,7 @@ int spi_nor_scan(struct spi_nor *nor, co
+@@ -267
8,7 +2686
,7 @@ int spi_nor_scan(struct spi_nor *nor, co
info = spi_nor_match_id(name);
/* Try to auto-detect if chip name wasn't specified or not found */
if (!info)
info = spi_nor_match_id(name);
/* Try to auto-detect if chip name wasn't specified or not found */
if (!info)
@@
-51,7
+51,7
@@
if (IS_ERR_OR_NULL(info))
return -ENOENT;
if (IS_ERR_OR_NULL(info))
return -ENOENT;
-@@ -268
3,7 +2691
,7 @@ int spi_nor_scan(struct spi_nor *nor, co
+@@ -268
9,7 +2697
,7 @@ int spi_nor_scan(struct spi_nor *nor, co
if (name && info->id_len) {
const struct flash_info *jinfo;
if (name && info->id_len) {
const struct flash_info *jinfo;
diff --git
a/target/linux/ipq806x/patches-4.14/105-mtd-nor-add-mx25l25635f.patch
b/target/linux/ipq806x/patches-4.14/105-mtd-nor-add-mx25l25635f.patch
index 6ecda6c35a582b6093b4f21eba0035cd8d73db24..7ba0b2f2657e4a9fc2b859cf3dbe32fa328728b0 100644
(file)
--- a/
target/linux/ipq806x/patches-4.14/105-mtd-nor-add-mx25l25635f.patch
+++ b/
target/linux/ipq806x/patches-4.14/105-mtd-nor-add-mx25l25635f.patch
@@
-11,7
+11,7
@@
the ubi volume created by the other.
---
--- a/drivers/mtd/spi-nor/spi-nor.c
+++ b/drivers/mtd/spi-nor/spi-nor.c
---
--- a/drivers/mtd/spi-nor/spi-nor.c
+++ b/drivers/mtd/spi-nor/spi-nor.c
-@@ -10
24,7 +1024
,7 @@ static const struct flash_info spi_nor_i
+@@ -10
30,7 +1030
,7 @@ static const struct flash_info spi_nor_i
{ "mx25u6435f", INFO(0xc22537, 0, 64 * 1024, 128, SECT_4K) },
{ "mx25l12805d", INFO(0xc22018, 0, 64 * 1024, 256, 0) },
{ "mx25l12855e", INFO(0xc22618, 0, 64 * 1024, 256, 0) },
{ "mx25u6435f", INFO(0xc22537, 0, 64 * 1024, 128, SECT_4K) },
{ "mx25l12805d", INFO(0xc22018, 0, 64 * 1024, 256, 0) },
{ "mx25l12855e", INFO(0xc22618, 0, 64 * 1024, 256, 0) },
diff --git
a/target/linux/lantiq/patches-4.14/0152-lantiq-VPE.patch
b/target/linux/lantiq/patches-4.14/0152-lantiq-VPE.patch
index c0639e137f88d3c52f2c111b33d250489ecc18f3..fc4e414df5aea1bb57c2e810bd9a0491c8a4aae2 100644
(file)
--- a/
target/linux/lantiq/patches-4.14/0152-lantiq-VPE.patch
+++ b/
target/linux/lantiq/patches-4.14/0152-lantiq-VPE.patch
@@
-1,6
+1,6
@@
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
-@@ -232
3,6 +2323
,12 @@ config MIPS_VPE_LOADER
+@@ -232
4,6 +2324
,12 @@ config MIPS_VPE_LOADER
Includes a loader for loading an elf relocatable object
onto another VPE and running it.
Includes a loader for loading an elf relocatable object
onto another VPE and running it.
diff --git
a/target/linux/mediatek/patches-4.14/0052-net-phy-add-FC.patch
b/target/linux/mediatek/patches-4.14/0052-net-phy-add-FC.patch
index 134d95d99261cfcec00b33a3aa3b21674275c06e..c396e314a9f1e1ba9637dcf7aaf2c4d74c704022 100644
(file)
--- a/
target/linux/mediatek/patches-4.14/0052-net-phy-add-FC.patch
+++ b/
target/linux/mediatek/patches-4.14/0052-net-phy-add-FC.patch
@@
-10,7
+10,7
@@
Signed-off-by: John Crispin <john@phrozen.org>
--- a/drivers/net/phy/phy_device.c
+++ b/drivers/net/phy/phy_device.c
--- a/drivers/net/phy/phy_device.c
+++ b/drivers/net/phy/phy_device.c
-@@ -19
26,7 +1926
,7 @@ static struct phy_driver genphy_driver =
+@@ -19
43,7 +1943
,7 @@ static struct phy_driver genphy_driver =
.config_init = genphy_config_init,
.features = PHY_GBIT_FEATURES | SUPPORTED_MII |
SUPPORTED_AUI | SUPPORTED_FIBRE |
.config_init = genphy_config_init,
.features = PHY_GBIT_FEATURES | SUPPORTED_MII |
SUPPORTED_AUI | SUPPORTED_FIBRE |
diff --git
a/target/linux/oxnas/patches-4.14/010-add-console-to-pogoplogv3-bootargs.patch
b/target/linux/oxnas/patches-4.14/010-add-console-to-pogoplogv3-bootargs.patch
index 56e0eaf19cfd3c857a1c18d239a0bc1f814da0e8..4ca42db1e0f9196b9f2bc727ce10dc44c0267817 100644
(file)
--- a/
target/linux/oxnas/patches-4.14/010-add-console-to-pogoplogv3-bootargs.patch
+++ b/
target/linux/oxnas/patches-4.14/010-add-console-to-pogoplogv3-bootargs.patch
@@
-1,5
+1,5
@@
---- a/arch/arm/boot/dts/ox820-cloudengines-pogoplug-series-3.dts
2018-08-14 18:03:56.542679083 +0200
-+++ b/arch/arm/boot/dts/ox820-cloudengines-pogoplug-series-3.dts
2018-11-04 18:19:35.154886643 +0100
+--- a/arch/arm/boot/dts/ox820-cloudengines-pogoplug-series-3.dts
++++ b/arch/arm/boot/dts/ox820-cloudengines-pogoplug-series-3.dts
@@ -15,7 +15,7 @@
compatible = "cloudengines,pogoplugv3", "oxsemi,ox820";
@@ -15,7 +15,7 @@
compatible = "cloudengines,pogoplugv3", "oxsemi,ox820";
diff --git
a/target/linux/pistachio/patches-4.14/401-mtd-nor-support-mtd-name-from-device-tree.patch
b/target/linux/pistachio/patches-4.14/401-mtd-nor-support-mtd-name-from-device-tree.patch
index 47b6b177696cbcb41b7d2951a1ed798f5745b76f..16cfa211a73a93f64f2241565a5e80fa2b751228 100644
(file)
--- a/
target/linux/pistachio/patches-4.14/401-mtd-nor-support-mtd-name-from-device-tree.patch
+++ b/
target/linux/pistachio/patches-4.14/401-mtd-nor-support-mtd-name-from-device-tree.patch
@@
-10,7
+10,7
@@
Signed-off-by: Abhimanyu Vishwakarma <Abhimanyu.Vishwakarma@imgtec.com>
--- a/drivers/mtd/spi-nor/spi-nor.c
+++ b/drivers/mtd/spi-nor/spi-nor.c
--- a/drivers/mtd/spi-nor/spi-nor.c
+++ b/drivers/mtd/spi-nor/spi-nor.c
-@@ -26
56,6 +2656
,7 @@ int spi_nor_scan(struct spi_nor *nor, co
+@@ -26
62,6 +2662
,7 @@ int spi_nor_scan(struct spi_nor *nor, co
struct device *dev = nor->dev;
struct mtd_info *mtd = &nor->mtd;
struct device_node *np = spi_nor_get_flash_node(nor);
struct device *dev = nor->dev;
struct mtd_info *mtd = &nor->mtd;
struct device_node *np = spi_nor_get_flash_node(nor);
@@
-18,7
+18,7
@@
Signed-off-by: Abhimanyu Vishwakarma <Abhimanyu.Vishwakarma@imgtec.com>
int ret;
int i;
int ret;
int i;
-@@ -273
1,7 +2732
,12 @@ int spi_nor_scan(struct spi_nor *nor, co
+@@ -273
7,7 +2738
,12 @@ int spi_nor_scan(struct spi_nor *nor, co
spi_nor_wait_till_ready(nor);
}
spi_nor_wait_till_ready(nor);
}
diff --git
a/target/linux/ramips/patches-4.14/0025-pinctrl-ralink-add-pinctrl-driver.patch
b/target/linux/ramips/patches-4.14/0025-pinctrl-ralink-add-pinctrl-driver.patch
index e9a03d93dddd39d60aaf87339adfdb5236b575b4..a374e01b5935f96697b405f8338515cd49eae2ca 100644
(file)
--- a/
target/linux/ramips/patches-4.14/0025-pinctrl-ralink-add-pinctrl-driver.patch
+++ b/
target/linux/ramips/patches-4.14/0025-pinctrl-ralink-add-pinctrl-driver.patch
@@
-14,7
+14,7
@@
Signed-off-by: John Crispin <blogic@openwrt.org>
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
-@@ -62
8,6 +628
,8 @@ config RALINK
+@@ -62
9,6 +629
,8 @@ config RALINK
select CLKDEV_LOOKUP
select ARCH_HAS_RESET_CONTROLLER
select RESET_CONTROLLER
select CLKDEV_LOOKUP
select ARCH_HAS_RESET_CONTROLLER
select RESET_CONTROLLER
diff --git
a/target/linux/ramips/patches-4.14/0028-GPIO-ralink-add-mt7621-gpio-controller.patch
b/target/linux/ramips/patches-4.14/0028-GPIO-ralink-add-mt7621-gpio-controller.patch
index d657274efe49859e0abe69c17d8dd9858c068724..debeae28060a2e1a59931124efad21bc355fe445 100644
(file)
--- a/
target/linux/ramips/patches-4.14/0028-GPIO-ralink-add-mt7621-gpio-controller.patch
+++ b/
target/linux/ramips/patches-4.14/0028-GPIO-ralink-add-mt7621-gpio-controller.patch
@@
-14,7
+14,7
@@
Signed-off-by: John Crispin <blogic@openwrt.org>
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
-@@ -63
0,6 +630
,9 @@ config RALINK
+@@ -63
1,6 +631
,9 @@ config RALINK
select RESET_CONTROLLER
select PINCTRL
select PINCTRL_RT2880
select RESET_CONTROLLER
select PINCTRL
select PINCTRL_RT2880
diff --git
a/target/linux/ramips/patches-4.14/0031-uvc-add-iPassion-iP2970-support.patch
b/target/linux/ramips/patches-4.14/0031-uvc-add-iPassion-iP2970-support.patch
index 85a5c1310c1a388ffe67d032d552419e6b857153..19bac1f64ff6fb22b84888db3dca39f81b356dd1 100644
(file)
--- a/
target/linux/ramips/patches-4.14/0031-uvc-add-iPassion-iP2970-support.patch
+++ b/
target/linux/ramips/patches-4.14/0031-uvc-add-iPassion-iP2970-support.patch
@@
-13,7
+13,7
@@
Signed-off-by: John Crispin <blogic@openwrt.org>
--- a/drivers/media/usb/uvc/uvc_driver.c
+++ b/drivers/media/usb/uvc/uvc_driver.c
--- a/drivers/media/usb/uvc/uvc_driver.c
+++ b/drivers/media/usb/uvc/uvc_driver.c
-@@ -27
34,6 +2734
,18 @@ static const struct usb_device_id uvc_id
+@@ -27
27,6 +2727
,18 @@ static const struct usb_device_id uvc_id
.bInterfaceSubClass = 1,
.bInterfaceProtocol = 0,
.driver_info = UVC_QUIRK_FORCE_Y8 },
.bInterfaceSubClass = 1,
.bInterfaceProtocol = 0,
.driver_info = UVC_QUIRK_FORCE_Y8 },
diff --git
a/target/linux/ramips/patches-4.14/0053-mtd-spi-nor-add-w25q256-3b-mode-switch.patch
b/target/linux/ramips/patches-4.14/0053-mtd-spi-nor-add-w25q256-3b-mode-switch.patch
index e7161af9595bac98e233f482481cd47b5a9b2aeb..9a18e515ae2ad5981838f74036b50c56c43d8def 100644
(file)
--- a/
target/linux/ramips/patches-4.14/0053-mtd-spi-nor-add-w25q256-3b-mode-switch.patch
+++ b/
target/linux/ramips/patches-4.14/0053-mtd-spi-nor-add-w25q256-3b-mode-switch.patch
@@
-116,7
+116,7
@@
Signed-off-by: Felix Fietkau <nbd@nbd.name>
spi_nor_unlock_and_unprep(nor, SPI_NOR_OPS_LOCK);
return ret;
spi_nor_unlock_and_unprep(nor, SPI_NOR_OPS_LOCK);
return ret;
-@@ -117
0,7 +1222
,7 @@ static const struct flash_info spi_nor_i
+@@ -117
6,7 +1228
,7 @@ static const struct flash_info spi_nor_i
{ "w25q80", INFO(0xef5014, 0, 64 * 1024, 16, SECT_4K) },
{ "w25q80bl", INFO(0xef4014, 0, 64 * 1024, 16, SECT_4K) },
{ "w25q128", INFO(0xef4018, 0, 64 * 1024, 256, SECT_4K) },
{ "w25q80", INFO(0xef5014, 0, 64 * 1024, 16, SECT_4K) },
{ "w25q80bl", INFO(0xef4014, 0, 64 * 1024, 16, SECT_4K) },
{ "w25q128", INFO(0xef4018, 0, 64 * 1024, 256, SECT_4K) },
@@
-125,7
+125,7
@@
Signed-off-by: Felix Fietkau <nbd@nbd.name>
{ "w25m512jv", INFO(0xef7119, 0, 64 * 1024, 1024,
SECT_4K | SPI_NOR_QUAD_READ | SPI_NOR_DUAL_READ) },
{ "w25m512jv", INFO(0xef7119, 0, 64 * 1024, 1024,
SECT_4K | SPI_NOR_QUAD_READ | SPI_NOR_DUAL_READ) },
-@@ -123
0,6 +1282
,9 @@ static int spi_nor_read(struct mtd_info
+@@ -123
6,6 +1288
,9 @@ static int spi_nor_read(struct mtd_info
if (ret)
return ret;
if (ret)
return ret;
@@
-135,7
+135,7
@@
Signed-off-by: Felix Fietkau <nbd@nbd.name>
while (len) {
loff_t addr = from;
while (len) {
loff_t addr = from;
-@@ -12
54,6 +1309
,18 @@ static int spi_nor_read(struct mtd_info
+@@ -12
60,6 +1315
,18 @@ static int spi_nor_read(struct mtd_info
ret = 0;
read_err:
ret = 0;
read_err:
@@
-154,7
+154,7
@@
Signed-off-by: Felix Fietkau <nbd@nbd.name>
spi_nor_unlock_and_unprep(nor, SPI_NOR_OPS_READ);
return ret;
}
spi_nor_unlock_and_unprep(nor, SPI_NOR_OPS_READ);
return ret;
}
-@@ -13
55,6 +1422
,10 @@ static int spi_nor_write(struct mtd_info
+@@ -13
61,6 +1428
,10 @@ static int spi_nor_write(struct mtd_info
if (ret)
return ret;
if (ret)
return ret;
@@
-165,7
+165,7
@@
Signed-off-by: Felix Fietkau <nbd@nbd.name>
for (i = 0; i < len; ) {
ssize_t written;
loff_t addr = to + i;
for (i = 0; i < len; ) {
ssize_t written;
loff_t addr = to + i;
-@@ -1
395,6 +1466
,7 @@ static int spi_nor_write(struct mtd_info
+@@ -1
401,6 +1472
,7 @@ static int spi_nor_write(struct mtd_info
}
write_err:
}
write_err:
@@
-173,7
+173,7
@@
Signed-off-by: Felix Fietkau <nbd@nbd.name>
spi_nor_unlock_and_unprep(nor, SPI_NOR_OPS_WRITE);
return ret;
}
spi_nor_unlock_and_unprep(nor, SPI_NOR_OPS_WRITE);
return ret;
}
-@@ -281
1,8 +2883
,10 @@ int spi_nor_scan(struct spi_nor *nor, co
+@@ -281
7,8 +2889
,10 @@ int spi_nor_scan(struct spi_nor *nor, co
} else if (mtd->size > 0x1000000) {
/* enable 4-byte addressing if the device exceeds 16MiB */
nor->addr_width = 4;
} else if (mtd->size > 0x1000000) {
/* enable 4-byte addressing if the device exceeds 16MiB */
nor->addr_width = 4;
diff --git
a/target/linux/ramips/patches-4.14/0054-mtd-spi-nor-w25q256-respect-default-mode.patch
b/target/linux/ramips/patches-4.14/0054-mtd-spi-nor-w25q256-respect-default-mode.patch
index 99a9c2e53ff40d2e55ce2b54b6b9bb34d1487256..f621e13768fde3331d7a02f5dedd4adb7ed38e92 100644
(file)
--- a/
target/linux/ramips/patches-4.14/0054-mtd-spi-nor-w25q256-respect-default-mode.patch
+++ b/
target/linux/ramips/patches-4.14/0054-mtd-spi-nor-w25q256-respect-default-mode.patch
@@
-33,7
+33,7
@@
/*
* Write status register 1 byte
* Returns negative if error occurred.
/*
* Write status register 1 byte
* Returns negative if error occurred.
-@@ -288
3,9 +2892
,16 @@ int spi_nor_scan(struct spi_nor *nor, co
+@@ -288
9,9 +2898
,16 @@ int spi_nor_scan(struct spi_nor *nor, co
} else if (mtd->size > 0x1000000) {
/* enable 4-byte addressing if the device exceeds 16MiB */
nor->addr_width = 4;
} else if (mtd->size > 0x1000000) {
/* enable 4-byte addressing if the device exceeds 16MiB */
nor->addr_width = 4;
diff --git
a/target/linux/ramips/patches-4.14/303-spi-nor-enable-4B-opcodes-for-mx66l51235l.patch
b/target/linux/ramips/patches-4.14/303-spi-nor-enable-4B-opcodes-for-mx66l51235l.patch
index 7b2b280d35f47ee2c3a2f0aaaa1760f5f714eddf..ab0146961b09fe718915adcf83b2ac53bc66887e 100644
(file)
--- a/
target/linux/ramips/patches-4.14/303-spi-nor-enable-4B-opcodes-for-mx66l51235l.patch
+++ b/
target/linux/ramips/patches-4.14/303-spi-nor-enable-4B-opcodes-for-mx66l51235l.patch
@@
-1,6
+1,6
@@
--- a/drivers/mtd/spi-nor/spi-nor.c
+++ b/drivers/mtd/spi-nor/spi-nor.c
--- a/drivers/mtd/spi-nor/spi-nor.c
+++ b/drivers/mtd/spi-nor/spi-nor.c
-@@ -109
3,7 +1093
,7 @@ static const struct flash_info spi_nor_i
+@@ -109
9,7 +1099
,7 @@ static const struct flash_info spi_nor_i
{ "mx25l25635e", INFO(0xc22019, 0, 64 * 1024, 512, SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
{ "mx25u25635f", INFO(0xc22539, 0, 64 * 1024, 512, SECT_4K | SPI_NOR_4B_OPCODES) },
{ "mx25l25655e", INFO(0xc22619, 0, 64 * 1024, 512, 0) },
{ "mx25l25635e", INFO(0xc22019, 0, 64 * 1024, 512, SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
{ "mx25u25635f", INFO(0xc22539, 0, 64 * 1024, 512, SECT_4K | SPI_NOR_4B_OPCODES) },
{ "mx25l25655e", INFO(0xc22619, 0, 64 * 1024, 512, 0) },