From ffd36a4ab8f4b552e42066a2b7b9290781235f13 Mon Sep 17 00:00:00 2001
From: Michal Hrusecky <Michal@Hrusecky.net>
Date: Wed, 30 Jan 2019 08:45:34 +0100
Subject: [PATCH] Reorder kernel patches to make build pass
---
.../wip/0004-mvebu-Basic-MoX-support.patch | 28 +++++++++++++++----
1 file changed, 23 insertions(+), 5 deletions(-)
diff --git a/patches/openwrt/wip/0004-mvebu-Basic-MoX-support.patch b/patches/openwrt/wip/0004-mvebu-Basic-MoX-support.patch
index dc7f194ca..e5cff238a 100644
--- a/patches/openwrt/wip/0004-mvebu-Basic-MoX-support.patch
+++ b/patches/openwrt/wip/0004-mvebu-Basic-MoX-support.patch
@@ -1,4 +1,4 @@
-From a6fa7694cfa3d9d85b17d17dbf96bf169bd220f8 Mon Sep 17 00:00:00 2001
+From 35d374048519163bc8a8df2bf201c5a6f1200680 Mon Sep 17 00:00:00 2001
From: Michal Hrusecky <Michal@Hrusecky.net>
Date: Wed, 7 Mar 2018 17:10:32 +0100
Subject: [PATCH] mvebu: Basic MoX support
@@ -137,7 +137,10 @@ Signed-off-by: Michal Hrusecky <Michal@Hrusecky.net>
...-Add-Turris-Mox-rWTM-firmware-driver.patch | 423 ++++++++
...-marvell-Add-DTS-file-for-Turris-Mox.patch | 931 ++++++++++++++++++
...-cpufreq-armada-37xx-Fix-clock-leak.patch} | 0
- 130 files changed, 14282 insertions(+), 415 deletions(-)
+ ...37xx-periph-Fix-switching-CPU-rate-.patch} | 0
+ ...37xx-periph-Fix-wrong-return-value-.patch} | 0
+ ...37xx-periph-Remove-unused-var-num_p.patch} | 0
+ 133 files changed, 14282 insertions(+), 415 deletions(-)
delete mode 100644 target/linux/mvebu/patches-4.14/450-reprobe_sfp_phy.patch
delete mode 100644 target/linux/mvebu/patches-4.14/527-PCI-aardvark-allow-to-specify-link-capability.patch
create mode 100644 target/linux/mvebu/patches-4.14/90001-crypto-inside-secure-remove-null-check-before-kfree.patch
@@ -266,12 +269,15 @@ Signed-off-by: Michal Hrusecky <Michal@Hrusecky.net>
create mode 100644 target/linux/mvebu/patches-4.14/90124-crypto-Add-Turris-Mox-rWTM-firmware-driver.patch
create mode 100644 target/linux/mvebu/patches-4.14/90125-ARM64-dts-marvell-Add-DTS-file-for-Turris-Mox.patch
rename target/linux/mvebu/patches-4.14/{509-cpufreq-armada-37xx-Fix-clock-leak.patch => 9509-cpufreq-armada-37xx-Fix-clock-leak.patch} (100%)
+ rename target/linux/mvebu/patches-4.14/{510-clk-mvebu-armada-37xx-periph-Fix-switching-CPU-rate-.patch => 99510-clk-mvebu-armada-37xx-periph-Fix-switching-CPU-rate-.patch} (100%)
+ rename target/linux/mvebu/patches-4.14/{511-clk-mvebu-armada-37xx-periph-Fix-wrong-return-value-.patch => 99511-clk-mvebu-armada-37xx-periph-Fix-wrong-return-value-.patch} (100%)
+ rename target/linux/mvebu/patches-4.14/{512-clk-mvebu-armada-37xx-periph-Remove-unused-var-num_p.patch => 99512-clk-mvebu-armada-37xx-periph-Remove-unused-var-num_p.patch} (100%)
diff --git a/target/linux/mvebu/config-4.14 b/target/linux/mvebu/config-4.14
-index f5e987616e..1e7dbdac8a 100644
+index 742df4bc19..3b7386b5d2 100644
--- a/target/linux/mvebu/config-4.14
+++ b/target/linux/mvebu/config-4.14
-@@ -375,6 +375,7 @@ CONFIG_NEED_DMA_MAP_STATE=y
+@@ -376,6 +376,7 @@ CONFIG_NEED_DMA_MAP_STATE=y
CONFIG_NEON=y
# CONFIG_NET_CLS_CGROUP is not set
CONFIG_NET_DSA=y
@@ -16867,6 +16873,18 @@ diff --git a/target/linux/mvebu/patches-4.14/509-cpufreq-armada-37xx-Fix-clock-l
similarity index 100%
rename from target/linux/mvebu/patches-4.14/509-cpufreq-armada-37xx-Fix-clock-leak.patch
rename to target/linux/mvebu/patches-4.14/9509-cpufreq-armada-37xx-Fix-clock-leak.patch
+diff --git a/target/linux/mvebu/patches-4.14/510-clk-mvebu-armada-37xx-periph-Fix-switching-CPU-rate-.patch b/target/linux/mvebu/patches-4.14/99510-clk-mvebu-armada-37xx-periph-Fix-switching-CPU-rate-.patch
+similarity index 100%
+rename from target/linux/mvebu/patches-4.14/510-clk-mvebu-armada-37xx-periph-Fix-switching-CPU-rate-.patch
+rename to target/linux/mvebu/patches-4.14/99510-clk-mvebu-armada-37xx-periph-Fix-switching-CPU-rate-.patch
+diff --git a/target/linux/mvebu/patches-4.14/511-clk-mvebu-armada-37xx-periph-Fix-wrong-return-value-.patch b/target/linux/mvebu/patches-4.14/99511-clk-mvebu-armada-37xx-periph-Fix-wrong-return-value-.patch
+similarity index 100%
+rename from target/linux/mvebu/patches-4.14/511-clk-mvebu-armada-37xx-periph-Fix-wrong-return-value-.patch
+rename to target/linux/mvebu/patches-4.14/99511-clk-mvebu-armada-37xx-periph-Fix-wrong-return-value-.patch
+diff --git a/target/linux/mvebu/patches-4.14/512-clk-mvebu-armada-37xx-periph-Remove-unused-var-num_p.patch b/target/linux/mvebu/patches-4.14/99512-clk-mvebu-armada-37xx-periph-Remove-unused-var-num_p.patch
+similarity index 100%
+rename from target/linux/mvebu/patches-4.14/512-clk-mvebu-armada-37xx-periph-Remove-unused-var-num_p.patch
+rename to target/linux/mvebu/patches-4.14/99512-clk-mvebu-armada-37xx-periph-Remove-unused-var-num_p.patch
--
-2.19.2
+2.20.1
--
GitLab