aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ath79/patches-4.14/0027-MIPS-ath79-drop-mips_machine-support.patch
diff options
context:
space:
mode:
authorKoen Vandeputte <koen.vandeputte@ncentric.com>2018-05-17 18:41:26 +0200
committerJohn Crispin <john@phrozen.org>2018-05-18 09:10:46 +0200
commite2aa0c3f8b49f62fc83ec90f0bc5a67560fffa73 (patch)
tree01d46d7549a9554ff8a659993b97b3d07f5e59f1 /target/linux/ath79/patches-4.14/0027-MIPS-ath79-drop-mips_machine-support.patch
parent12f44b83a8db2c95274839e2e41792e096021f29 (diff)
downloadupstream-e2aa0c3f8b49f62fc83ec90f0bc5a67560fffa73.tar.gz
upstream-e2aa0c3f8b49f62fc83ec90f0bc5a67560fffa73.tar.bz2
upstream-e2aa0c3f8b49f62fc83ec90f0bc5a67560fffa73.zip
kernel: bump 4.14 to 4.14.41
Refreshed all patches Dropped upstreamed patches: 522-PCI-aardvark-fix-logic-in-PCI-configuration-read-write-functions.patch 523-PCI-aardvark-set-PIO_ADDR_LS-correctly-in-advk_pcie_rd_conf.patch 525-PCI-aardvark-use-isr1-instead-of-isr0-interrupt-in-legacy-irq-mode.patch 527-PCI-aardvark-fix-PCIe-max-read-request-size-setting.patch updated patches: 524-PCI-aardvark-set-host-and-device-to-the-same-MAX-payload-size.patch 030-USB-serial-option-fix-dwm-158-3g-modem-interface.patch Added new ARM64 symbol: CONFIG_ARM64_ERRATUM_1024718 Compile-tested on: cns3xxx, imx6, mvebu (arm64), x86_64 Runtime-tested on: cns3xxx, imx6, x86_64 Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/ath79/patches-4.14/0027-MIPS-ath79-drop-mips_machine-support.patch')
-rw-r--r--target/linux/ath79/patches-4.14/0027-MIPS-ath79-drop-mips_machine-support.patch22
1 files changed, 7 insertions, 15 deletions
diff --git a/target/linux/ath79/patches-4.14/0027-MIPS-ath79-drop-mips_machine-support.patch b/target/linux/ath79/patches-4.14/0027-MIPS-ath79-drop-mips_machine-support.patch
index fd47b775f0..cde3bae674 100644
--- a/target/linux/ath79/patches-4.14/0027-MIPS-ath79-drop-mips_machine-support.patch
+++ b/target/linux/ath79/patches-4.14/0027-MIPS-ath79-drop-mips_machine-support.patch
@@ -11,10 +11,8 @@ Signed-off-by: John Crispin <john@phrozen.org>
3 files changed, 10 insertions(+), 93 deletions(-)
delete mode 100644 arch/mips/ath79/machtypes.h
-Index: linux-4.14.18/arch/mips/Kconfig
-===================================================================
---- linux-4.14.18.orig/arch/mips/Kconfig
-+++ linux-4.14.18/arch/mips/Kconfig
+--- a/arch/mips/Kconfig
++++ b/arch/mips/Kconfig
@@ -196,7 +196,6 @@ config ATH79
select COMMON_CLK
select CLKDEV_LOOKUP
@@ -23,9 +21,7 @@ Index: linux-4.14.18/arch/mips/Kconfig
select SYS_HAS_CPU_MIPS32_R2
select SYS_HAS_EARLY_PRINTK
select SYS_SUPPORTS_32BIT_KERNEL
-Index: linux-4.14.18/arch/mips/ath79/machtypes.h
-===================================================================
---- linux-4.14.18.orig/arch/mips/ath79/machtypes.h
+--- a/arch/mips/ath79/machtypes.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
@@ -56,10 +52,8 @@ Index: linux-4.14.18/arch/mips/ath79/machtypes.h
-};
-
-#endif /* _ATH79_MACHTYPE_H */
-Index: linux-4.14.18/arch/mips/ath79/setup.c
-===================================================================
---- linux-4.14.18.orig/arch/mips/ath79/setup.c
-+++ linux-4.14.18/arch/mips/ath79/setup.c
+--- a/arch/mips/ath79/setup.c
++++ b/arch/mips/ath79/setup.c
@@ -32,7 +32,6 @@
#include <asm/mach-ath79/ath79.h>
#include <asm/mach-ath79/ar71xx_regs.h>
@@ -166,10 +160,8 @@ Index: linux-4.14.18/arch/mips/ath79/setup.c
- "DTB",
- "Generic AR71XX/AR724X/AR913X based board (DT)",
- NULL);
-Index: linux-4.14.18/arch/mips/ath79/clock.c
-===================================================================
---- linux-4.14.18.orig/arch/mips/ath79/clock.c
-+++ linux-4.14.18/arch/mips/ath79/clock.c
+--- a/arch/mips/ath79/clock.c
++++ b/arch/mips/ath79/clock.c
@@ -26,7 +26,6 @@
#include <asm/mach-ath79/ath79.h>
#include <asm/mach-ath79/ar71xx_regs.h>