diff options
| author | Petr Štetiar <ynezz@true.cz> | 2021-12-12 08:19:37 +0100 |
|---|---|---|
| committer | Petr Štetiar <ynezz@true.cz> | 2021-12-19 08:23:23 +0100 |
| commit | 1d94f72439034c112bfa4b694fc736123f4890a5 (patch) | |
| tree | c0c916ea430038c38dfe0eec583ec31dacd2b6af /target/linux/ipq806x | |
| parent | cc8c1be438a3d19fec06b72b1e7854f31b9e2f71 (diff) | |
| download | upstream-1d94f72439034c112bfa4b694fc736123f4890a5.tar.gz upstream-1d94f72439034c112bfa4b694fc736123f4890a5.tar.bz2 upstream-1d94f72439034c112bfa4b694fc736123f4890a5.zip | |
kernel: bump 4.14 to 4.14.258
Rebased patches:
* generic: 273-batman-adv-Convert-packet.h-to-uapi-header.patch
* ipq806x: 0065-arm-override-compiler-flags.patch
* mvebu: 513-arm64-dts-marvell-armada37xx-Add-emmc-sdio-pinctrl-d.patch
Removed patches:
Fixed upstream:
* ar71xx: 821-serial-core-add-support-for-boot-console-with-arbitr.patch
* ath79: 921-serial-core-add-support-for-boot-console-with-arbitr.patch
- in 4.14.256 via 9112e7ef87149b3d8093e7446d784117f6e18d69
* mvebu: 527-PCI-aardvark-allow-to-specify-link-capability.patch
- in 4.14.257 via 62a3dc9b65a2b24800fc4267b8cf590fad135034
* mvebu: 524-PCI-aardvark-set-host-and-device-to-the-same-MAX-payload-size.patch
- should be hopefully fixed by the bunch of changes in .256 and .257
Run tested on ipq40xx/glinet-b1300 and mvebu/turris-omnia.
Fixes: CVE-2021-3640
Signed-off-by: Petr Štetiar <ynezz@true.cz>
Diffstat (limited to 'target/linux/ipq806x')
| -rw-r--r-- | target/linux/ipq806x/patches-4.14/0065-arm-override-compiler-flags.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/ipq806x/patches-4.14/0065-arm-override-compiler-flags.patch b/target/linux/ipq806x/patches-4.14/0065-arm-override-compiler-flags.patch index 0d2a4274c7..23c8581636 100644 --- a/target/linux/ipq806x/patches-4.14/0065-arm-override-compiler-flags.patch +++ b/target/linux/ipq806x/patches-4.14/0065-arm-override-compiler-flags.patch @@ -13,9 +13,9 @@ Signed-off-by: John Crispin <john@phrozen.org> @@ -67,7 +67,7 @@ KBUILD_CFLAGS += $(call cc-option,-fno-i # macro, but instead defines a whole series of macros which makes # testing for a specific architecture or later rather impossible. - arch-$(CONFIG_CPU_32v7M) =-D__LINUX_ARM_ARCH__=7 -march=armv7-m -Wa,-march=armv7-m --arch-$(CONFIG_CPU_32v7) =-D__LINUX_ARM_ARCH__=7 $(call cc-option,-march=armv7-a,-march=armv5t -Wa$(comma)-march=armv7-a) + arch-$(CONFIG_CPU_32v7M) =-D__LINUX_ARM_ARCH__=7 -march=armv7-m +-arch-$(CONFIG_CPU_32v7) =-D__LINUX_ARM_ARCH__=7 -march=armv7-a +arch-$(CONFIG_CPU_32v7) =-D__LINUX_ARM_ARCH__=7 -mcpu=cortex-a15 - arch-$(CONFIG_CPU_32v6) =-D__LINUX_ARM_ARCH__=6 $(call cc-option,-march=armv6,-march=armv5t -Wa$(comma)-march=armv6) + arch-$(CONFIG_CPU_32v6) =-D__LINUX_ARM_ARCH__=6 -march=armv6 # Only override the compiler option if ARMv6. The ARMv6K extensions are # always available in ARMv7 |