From b2d1b93dcbc9ba7bd146e6eb821d2e31700bcf97 Mon Sep 17 00:00:00 2001 From: Tad Date: Wed, 4 Apr 2018 21:24:08 -0400 Subject: [PATCH] 14.1: Drop bacon and m8, 15.1: Many more fixes --- Manifests/Manifest_LAOS-14.1.xml | 12 - Manifests/Manifest_LAOS-15.1.xml | 1 - .../0001-OverUnderClock-EXTREME.patch | 1369 ----------------- .../android_kernel_oneplus_msm8974.sh | 52 - Scripts/LineageOS-14.1/Functions.sh | 4 +- Scripts/LineageOS-14.1/Overclock.sh | 3 - .../android_kernel_google_marlin.sh | 2 +- .../android_kernel_htc_msm8974.sh | 0 .../android_kernel_lge_msm8996.sh | 89 ++ Scripts/LineageOS-15.1/Functions.sh | 7 +- Scripts/LineageOS-15.1/Patch.sh | 3 +- Scripts/LineageOS-15.1/Rebrand.sh | 1 + 12 files changed, 96 insertions(+), 1447 deletions(-) delete mode 100644 Patches/LineageOS-14.1/android_kernel_oneplus_msm8974/0001-OverUnderClock-EXTREME.patch delete mode 100644 Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_oneplus_msm8974.sh rename Scripts/{LineageOS-14.1 => LineageOS-15.1}/CVE_Patchers/android_kernel_htc_msm8974.sh (100%) create mode 100644 Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_lge_msm8996.sh diff --git a/Manifests/Manifest_LAOS-14.1.xml b/Manifests/Manifest_LAOS-14.1.xml index 951a710c..7cd3ec63 100644 --- a/Manifests/Manifest_LAOS-14.1.xml +++ b/Manifests/Manifest_LAOS-14.1.xml @@ -129,12 +129,6 @@ - - - - - - @@ -179,12 +173,6 @@ - - - - - - diff --git a/Manifests/Manifest_LAOS-15.1.xml b/Manifests/Manifest_LAOS-15.1.xml index 23b171e4..ee853e55 100644 --- a/Manifests/Manifest_LAOS-15.1.xml +++ b/Manifests/Manifest_LAOS-15.1.xml @@ -31,7 +31,6 @@ - diff --git a/Patches/LineageOS-14.1/android_kernel_oneplus_msm8974/0001-OverUnderClock-EXTREME.patch b/Patches/LineageOS-14.1/android_kernel_oneplus_msm8974/0001-OverUnderClock-EXTREME.patch deleted file mode 100644 index 4a8dbfc7..00000000 --- a/Patches/LineageOS-14.1/android_kernel_oneplus_msm8974/0001-OverUnderClock-EXTREME.patch +++ /dev/null @@ -1,1369 +0,0 @@ -From 4868289ebd16ed32f1c8d85db7029b87ea24406c Mon Sep 17 00:00:00 2001 -From: savoca -Date: Tue, 15 Jul 2014 17:12:39 +0000 -Subject: [PATCH 1/9] msm8974pro: dts: cpufreq: introduce 268MHz clock - ---- - arch/arm/boot/dts/msm8974pro.dtsi | 46 +++++++++++++++++++++++++++++++++++++++ - 1 file changed, 46 insertions(+) - -diff --git a/arch/arm/boot/dts/msm8974pro.dtsi b/arch/arm/boot/dts/msm8974pro.dtsi -index ded56d8..56ec557 100644 ---- a/arch/arm/boot/dts/msm8974pro.dtsi -+++ b/arch/arm/boot/dts/msm8974pro.dtsi -@@ -91,6 +91,7 @@ - qcom,clock-krait@f9016000 { - qcom,speed1-pvs0-bin-v0 = - < 0 0 0 >, -+ < 268800000 770000 68 >, - < 300000000 775000 74 >, - < 345600000 775000 85 >, - < 422400000 775000 104 >, -@@ -122,6 +123,7 @@ - - qcom,speed1-pvs1-bin-v0 = - < 0 0 0 >, -+ < 268800000 770000 68 >, - < 300000000 775000 74 >, - < 345600000 775000 85 >, - < 422400000 775000 104 >, -@@ -153,6 +155,7 @@ - - qcom,speed1-pvs2-bin-v0 = - < 0 0 0 >, -+ < 268800000 745000 68 >, - < 300000000 750000 74 >, - < 345600000 750000 85 >, - < 422400000 750000 104 >, -@@ -184,6 +187,7 @@ - - qcom,speed1-pvs3-bin-v0 = - < 0 0 0 >, -+ < 268800000 745000 68 >, - < 300000000 750000 74 >, - < 345600000 750000 85 >, - < 422400000 750000 104 >, -@@ -215,6 +219,7 @@ - - qcom,speed1-pvs4-bin-v0 = - < 0 0 0 >, -+ < 268800000 745000 68 >, - < 300000000 750000 74 >, - < 345600000 750000 85 >, - < 422400000 750000 104 >, -@@ -246,6 +251,7 @@ - - qcom,speed1-pvs5-bin-v0 = - < 0 0 0 >, -+ < 268800000 720000 68 >, - < 300000000 725000 74 >, - < 345600000 725000 85 >, - < 422400000 725000 104 >, -@@ -277,6 +283,7 @@ - - qcom,speed1-pvs6-bin-v0 = - < 0 0 0 >, -+ < 268800000 720000 68 >, - < 300000000 725000 74 >, - < 345600000 725000 85 >, - < 422400000 725000 104 >, -@@ -308,6 +315,7 @@ - - qcom,speed3-pvs0-bin-v0 = - < 0 0 0 >, -+ < 268800000 795000 68 >, - < 300000000 800000 76 >, - < 345600000 800000 87 >, - < 422400000 800000 106 >, -@@ -342,6 +350,7 @@ - - qcom,speed3-pvs1-bin-v0 = - < 0 0 0 >, -+ < 268800000 795000 68 >, - < 300000000 800000 76 >, - < 345600000 800000 87 >, - < 422400000 800000 106 >, -@@ -376,6 +385,7 @@ - - qcom,speed3-pvs2-bin-v0 = - < 0 0 0 >, -+ < 268800000 770000 68 >, - < 300000000 775000 76 >, - < 345600000 775000 87 >, - < 422400000 775000 106 >, -@@ -410,6 +420,7 @@ - - qcom,speed3-pvs3-bin-v0 = - < 0 0 0 >, -+ < 268800000 770000 68 >, - < 300000000 775000 76 >, - < 345600000 775000 87 >, - < 422400000 775000 106 >, -@@ -444,6 +455,7 @@ - - qcom,speed3-pvs4-bin-v0 = - < 0 0 0 >, -+ < 268800000 770000 68 >, - < 300000000 775000 76 >, - < 345600000 775000 87 >, - < 422400000 775000 106 >, -@@ -478,6 +490,7 @@ - - qcom,speed3-pvs5-bin-v0 = - < 0 0 0 >, -+ < 268800000 745000 68 >, - < 300000000 750000 76 >, - < 345600000 750000 87 >, - < 422400000 750000 106 >, -@@ -512,6 +525,7 @@ - - qcom,speed3-pvs6-bin-v0 = - < 0 0 0 >, -+ < 268800000 745000 68 >, - < 300000000 750000 76 >, - < 345600000 750000 87 >, - < 422400000 750000 106 >, -@@ -546,6 +560,7 @@ - - qcom,speed1-pvs0-bin-v1 = - < 0 0 0 >, -+ < 268800000 795000 68 >, - < 300000000 800000 76 >, - < 345600000 810000 87 >, - < 422400000 820000 108 >, -@@ -577,6 +592,7 @@ - - qcom,speed1-pvs1-bin-v1 = - < 0 0 0 >, -+ < 268800000 795000 68 >, - < 300000000 800000 76 >, - < 345600000 800000 87 >, - < 422400000 810000 108 >, -@@ -608,6 +624,7 @@ - - qcom,speed1-pvs2-bin-v1 = - < 0 0 0 >, -+ < 268800000 795000 68 >, - < 300000000 800000 76 >, - < 345600000 800000 87 >, - < 422400000 800000 108 >, -@@ -639,6 +656,7 @@ - - qcom,speed1-pvs3-bin-v1 = - < 0 0 0 >, -+ < 268800000 795000 68 >, - < 300000000 800000 76 >, - < 345600000 800000 87 >, - < 422400000 800000 108 >, -@@ -670,6 +688,7 @@ - - qcom,speed1-pvs4-bin-v1 = - < 0 0 0 >, -+ < 268800000 795000 68 >, - < 300000000 800000 76 >, - < 345600000 800000 87 >, - < 422400000 800000 108 >, -@@ -701,6 +720,7 @@ - - qcom,speed1-pvs5-bin-v1 = - < 0 0 0 >, -+ < 268800000 795000 68 >, - < 300000000 800000 76 >, - < 345600000 800000 87 >, - < 422400000 800000 108 >, -@@ -732,6 +752,7 @@ - - qcom,speed1-pvs6-bin-v1 = - < 0 0 0 >, -+ < 268800000 770000 68 >, - < 300000000 775000 76 >, - < 345600000 775000 87 >, - < 422400000 775000 108 >, -@@ -763,6 +784,7 @@ - - qcom,speed1-pvs7-bin-v1 = - < 0 0 0 >, -+ < 268800000 770000 68 >, - < 300000000 775000 76 >, - < 345600000 775000 87 >, - < 422400000 775000 108 >, -@@ -794,6 +816,7 @@ - - qcom,speed1-pvs8-bin-v1 = - < 0 0 0 >, -+ < 268800000 770000 68 >, - < 300000000 775000 76 >, - < 345600000 775000 87 >, - < 422400000 775000 108 >, -@@ -825,6 +848,7 @@ - - qcom,speed1-pvs9-bin-v1 = - < 0 0 0 >, -+ < 268800000 770000 68 >, - < 300000000 775000 76 >, - < 345600000 775000 87 >, - < 422400000 775000 108 >, -@@ -856,6 +880,7 @@ - - qcom,speed1-pvs10-bin-v1 = - < 0 0 0 >, -+ < 268800000 770000 68 >, - < 300000000 775000 76 >, - < 345600000 775000 87 >, - < 422400000 775000 108 >, -@@ -887,6 +912,7 @@ - - qcom,speed1-pvs11-bin-v1 = - < 0 0 0 >, -+ < 268800000 770000 68 >, - < 300000000 775000 76 >, - < 345600000 775000 87 >, - < 422400000 775000 108 >, -@@ -918,6 +944,7 @@ - - qcom,speed1-pvs12-bin-v1 = - < 0 0 0 >, -+ < 268800000 770000 68 >, - < 300000000 775000 76 >, - < 345600000 775000 87 >, - < 422400000 775000 108 >, -@@ -949,6 +976,7 @@ - - qcom,speed1-pvs13-bin-v1 = - < 0 0 0 >, -+ < 268800000 770000 68 >, - < 300000000 775000 76 >, - < 345600000 775000 87 >, - < 422400000 775000 108 >, -@@ -980,6 +1008,7 @@ - - qcom,speed1-pvs14-bin-v1 = - < 0 0 0 >, -+ < 268800000 745000 68 >, - < 300000000 750000 76 >, - < 345600000 750000 87 >, - < 422400000 750000 108 >, -@@ -1011,6 +1040,7 @@ - - qcom,speed1-pvs15-bin-v1 = - < 0 0 0 >, -+ < 268800000 745000 68 >, - < 300000000 750000 76 >, - < 345600000 750000 87 >, - < 422400000 750000 108 >, -@@ -1042,6 +1072,7 @@ - - qcom,speed3-pvs0-bin-v1 = - < 0 0 0 >, -+ < 268800000 795000 68 >, - < 300000000 800000 76 >, - < 345600000 800000 87 >, - < 422400000 800000 106 >, -@@ -1076,6 +1107,7 @@ - - qcom,speed3-pvs1-bin-v1 = - < 0 0 0 >, -+ < 268800000 795000 68 >, - < 300000000 800000 76 >, - < 345600000 800000 87 >, - < 422400000 800000 106 >, -@@ -1110,6 +1142,7 @@ - - qcom,speed3-pvs2-bin-v1 = - < 0 0 0 >, -+ < 268800000 795000 68 >, - < 300000000 800000 76 >, - < 345600000 800000 87 >, - < 422400000 800000 106 >, -@@ -1144,6 +1177,7 @@ - - qcom,speed3-pvs3-bin-v1 = - < 0 0 0 >, -+ < 268800000 795000 68 >, - < 300000000 800000 76 >, - < 345600000 800000 87 >, - < 422400000 800000 106 >, -@@ -1178,6 +1212,7 @@ - - qcom,speed3-pvs4-bin-v1 = - < 0 0 0 >, -+ < 268800000 795000 68 >, - < 300000000 800000 76 >, - < 345600000 800000 87 >, - < 422400000 800000 106 >, -@@ -1212,6 +1247,7 @@ - - qcom,speed3-pvs5-bin-v1 = - < 0 0 0 >, -+ < 268800000 795000 68 >, - < 300000000 800000 76 >, - < 345600000 800000 87 >, - < 422400000 800000 106 >, -@@ -1246,6 +1282,7 @@ - - qcom,speed3-pvs6-bin-v1 = - < 0 0 0 >, -+ < 268800000 770000 68 >, - < 300000000 775000 76 >, - < 345600000 775000 87 >, - < 422400000 775000 106 >, -@@ -1280,6 +1317,7 @@ - - qcom,speed3-pvs7-bin-v1 = - < 0 0 0 >, -+ < 268800000 770000 68 >, - < 300000000 775000 76 >, - < 345600000 775000 87 >, - < 422400000 775000 106 >, -@@ -1314,6 +1352,7 @@ - - qcom,speed3-pvs8-bin-v1 = - < 0 0 0 >, -+ < 268800000 770000 68 >, - < 300000000 775000 76 >, - < 345600000 775000 87 >, - < 422400000 775000 106 >, -@@ -1348,6 +1387,7 @@ - - qcom,speed3-pvs9-bin-v1 = - < 0 0 0 >, -+ < 268800000 770000 68 >, - < 300000000 775000 76 >, - < 345600000 775000 87 >, - < 422400000 775000 106 >, -@@ -1382,6 +1422,7 @@ - - qcom,speed3-pvs10-bin-v1 = - < 0 0 0 >, -+ < 268800000 770000 68 >, - < 300000000 775000 76 >, - < 345600000 775000 87 >, - < 422400000 775000 106 >, -@@ -1416,6 +1457,7 @@ - - qcom,speed3-pvs11-bin-v1 = - < 0 0 0 >, -+ < 268800000 770000 68 >, - < 300000000 775000 76 >, - < 345600000 775000 87 >, - < 422400000 775000 106 >, -@@ -1450,6 +1492,7 @@ - - qcom,speed3-pvs12-bin-v1 = - < 0 0 0 >, -+ < 268800000 770000 68 >, - < 300000000 775000 76 >, - < 345600000 775000 87 >, - < 422400000 775000 106 >, -@@ -1484,6 +1527,7 @@ - - qcom,speed3-pvs13-bin-v1 = - < 0 0 0 >, -+ < 268800000 770000 68 >, - < 300000000 775000 76 >, - < 345600000 775000 87 >, - < 422400000 775000 106 >, -@@ -1518,6 +1562,7 @@ - - qcom,speed3-pvs14-bin-v1 = - < 0 0 0 >, -+ < 268800000 745000 68 >, - < 300000000 750000 76 >, - < 345600000 750000 87 >, - < 422400000 750000 106 >, -@@ -1552,6 +1597,7 @@ - - qcom,speed3-pvs15-bin-v1 = - < 0 0 0 >, -+ < 268800000 745000 68 >, - < 300000000 750000 76 >, - < 345600000 750000 87 >, - < 422400000 750000 106 >, --- -2.10.2 - - -From 4f8754a25b6c3d84b2b47f44a6f662349689b018 Mon Sep 17 00:00:00 2001 -From: anarkia1976 -Date: Mon, 22 Sep 2014 06:27:11 +0200 -Subject: [PATCH 2/9] msm8974pro: dts: cpufreq: added qcom cpufreq reference - table - ---- - arch/arm/boot/dts/msm8974pro.dtsi | 24 ++++++++++++++++++++++++ - 1 file changed, 24 insertions(+) - -diff --git a/arch/arm/boot/dts/msm8974pro.dtsi b/arch/arm/boot/dts/msm8974pro.dtsi -index 56ec557..edaf44e 100644 ---- a/arch/arm/boot/dts/msm8974pro.dtsi -+++ b/arch/arm/boot/dts/msm8974pro.dtsi -@@ -1631,6 +1631,30 @@ - < 2457600000 970000 802 >; - }; - -+ qcom,msm-cpufreq@0 { -+ reg = <0 4>; -+ compatible = "qcom,msm-cpufreq"; -+ qcom,cpufreq-table = -+ < 268800 /* 75 MHz */ >, -+ < 300000 /* 75 MHz */ >, -+ < 422400 /* 150 MHz */ >, -+ < 652800 /* 200 MHz */ >, -+ < 729600 /* 307 MHz */ >, -+ < 883200 /* 307 MHz */ >, -+ < 960000 /* 460 MHz */ >, -+ < 1036800 /* 460 MHz */ >, -+ < 1190400 /* 460 MHz */ >, -+ < 1267200 /* 614 MHz */ >, -+ < 1497600 /* 614 MHz */ >, -+ < 1574400 /* 800 MHz */ >, -+ < 1728000 /* 800 MHz */ >, -+ < 1958400 /* 931 MHz */ >, -+ < 2265600 /* 931 MHz */ >, -+ < 2342400 /* 931 MHz */ >, -+ < 2419200 /* 931 MHz */ >, -+ < 2457600 /* 931 MHz */ >; -+ }; -+ - i2c@f9928000 { /* BLSP-1 QUP-6 */ - cell-index = <3>; - compatible = "qcom,i2c-qup"; --- -2.10.2 - - -From a0ad4e60da9fd1a1fff7c96c60c3fa4cb38ebebd Mon Sep 17 00:00:00 2001 -From: anarkia1976 -Date: Wed, 24 Sep 2014 17:45:31 +0200 -Subject: [PATCH 3/9] msm8974pro: dts: cpu overclocking to 2880Ghz - -Conflicts: - arch/arm/boot/dts/msm8974pro-pma8084-regulator.dtsi ---- - arch/arm/boot/dts/msm8974pro-pm8941.dtsi | 8 +-- - arch/arm/boot/dts/msm8974pro.dtsi | 120 ++++++++++++++++++++++++------- - 2 files changed, 100 insertions(+), 28 deletions(-) - -diff --git a/arch/arm/boot/dts/msm8974pro-pm8941.dtsi b/arch/arm/boot/dts/msm8974pro-pm8941.dtsi -index b502078..79729ea 100644 ---- a/arch/arm/boot/dts/msm8974pro-pm8941.dtsi -+++ b/arch/arm/boot/dts/msm8974pro-pm8941.dtsi -@@ -39,22 +39,22 @@ - }; - - &krait0_vreg { -- regulator-max-microvolt = <1120000>; -+ regulator-max-microvolt = <1250000>; - qcom,ldo-delta-voltage = <12500>; - }; - - &krait1_vreg { -- regulator-max-microvolt = <1120000>; -+ regulator-max-microvolt = <1250000>; - qcom,ldo-delta-voltage = <12500>; - }; - - &krait2_vreg { -- regulator-max-microvolt = <1120000>; -+ regulator-max-microvolt = <1250000>; - qcom,ldo-delta-voltage = <12500>; - }; - - &krait3_vreg { -- regulator-max-microvolt = <1120000>; -+ regulator-max-microvolt = <1250000>; - qcom,ldo-delta-voltage = <12500>; - }; - -diff --git a/arch/arm/boot/dts/msm8974pro.dtsi b/arch/arm/boot/dts/msm8974pro.dtsi -index edaf44e..9d59eaf 100644 ---- a/arch/arm/boot/dts/msm8974pro.dtsi -+++ b/arch/arm/boot/dts/msm8974pro.dtsi -@@ -346,7 +346,10 @@ - < 2265600000 1065000 700 >, - < 2342400000 1080000 734 >, - < 2419200000 1095000 769 >, -- < 2457600000 1100000 785 >; -+ < 2457600000 1100000 785 >, -+ < 2572800000 1120000 827 >, -+ < 2726400000 1180000 900 >, -+ < 2880000000 1210000 937 >; - - qcom,speed3-pvs1-bin-v0 = - < 0 0 0 >, -@@ -381,7 +384,10 @@ - < 2265600000 1040000 700 >, - < 2342400000 1055000 734 >, - < 2419200000 1070000 769 >, -- < 2457600000 1075000 785 >; -+ < 2457600000 1075000 785 >, -+ < 2572800000 1120000 827 >, -+ < 2726400000 1180000 900 >, -+ < 2880000000 1210000 937 >; - - qcom,speed3-pvs2-bin-v0 = - < 0 0 0 >, -@@ -416,7 +422,10 @@ - < 2265600000 1015000 700 >, - < 2342400000 1030000 734 >, - < 2419200000 1045000 769 >, -- < 2457600000 1050000 785 >; -+ < 2457600000 1050000 785 >, -+ < 2572800000 1100000 827 >, -+ < 2726400000 1170000 900 >, -+ < 2880000000 1200000 937 >; - - qcom,speed3-pvs3-bin-v0 = - < 0 0 0 >, -@@ -451,7 +460,10 @@ - < 2265600000 990000 700 >, - < 2342400000 1005000 734 >, - < 2419200000 1020000 769 >, -- < 2457600000 1025000 785 >; -+ < 2457600000 1025000 785 >, -+ < 2572800000 1090000 827 >, -+ < 2726400000 1160000 900 >, -+ < 2880000000 1190000 937 >; - - qcom,speed3-pvs4-bin-v0 = - < 0 0 0 >, -@@ -486,7 +498,10 @@ - < 2265600000 965000 700 >, - < 2342400000 980000 734 >, - < 2419200000 995000 769 >, -- < 2457600000 1000000 785 >; -+ < 2457600000 1000000 785 >, -+ < 2572800000 1050000 827 >, -+ < 2726400000 1150000 900 >, -+ < 2880000000 1180000 937 >; - - qcom,speed3-pvs5-bin-v0 = - < 0 0 0 >, -@@ -521,7 +536,10 @@ - < 2265600000 940000 700 >, - < 2342400000 955000 734 >, - < 2419200000 970000 769 >, -- < 2457600000 975000 785 >; -+ < 2457600000 975000 785 >, -+ < 2572800000 1000000 827 >, -+ < 2726400000 1150000 900 >, -+ < 2880000000 1170000 937 >; - - qcom,speed3-pvs6-bin-v0 = - < 0 0 0 >, -@@ -556,7 +574,10 @@ - < 2265600000 915000 700 >, - < 2342400000 930000 734 >, - < 2419200000 945000 769 >, -- < 2457600000 950000 785 >; -+ < 2457600000 950000 785 >, -+ < 2572800000 985000 827 >, -+ < 2726400000 1130000 900 >, -+ < 2880000000 1150000 937 >; - - qcom,speed1-pvs0-bin-v1 = - < 0 0 0 >, -@@ -1103,7 +1124,10 @@ - < 2265600000 1085000 716 >, - < 2342400000 1100000 751 >, - < 2419200000 1115000 786 >, -- < 2457600000 1120000 802 >; -+ < 2457600000 1120000 802 >, -+ < 2572800000 1150000 827 >, -+ < 2726400000 1200000 900 >, -+ < 2880000000 1240000 937 >; - - qcom,speed3-pvs1-bin-v1 = - < 0 0 0 >, -@@ -1138,7 +1162,10 @@ - < 2265600000 1075000 716 >, - < 2342400000 1090000 751 >, - < 2419200000 1105000 786 >, -- < 2457600000 1110000 802 >; -+ < 2457600000 1110000 802 >, -+ < 2572800000 1140000 827 >, -+ < 2726400000 1190000 900 >, -+ < 2880000000 1220000 937 >; - - qcom,speed3-pvs2-bin-v1 = - < 0 0 0 >, -@@ -1173,7 +1200,10 @@ - < 2265600000 1065000 716 >, - < 2342400000 1080000 751 >, - < 2419200000 1095000 786 >, -- < 2457600000 1100000 802 >; -+ < 2457600000 1100000 802 >, -+ < 2572800000 1120000 827 >, -+ < 2726400000 1160000 900 >, -+ < 2880000000 1190000 937 >; - - qcom,speed3-pvs3-bin-v1 = - < 0 0 0 >, -@@ -1208,7 +1238,10 @@ - < 2265600000 1055000 716 >, - < 2342400000 1070000 751 >, - < 2419200000 1085000 786 >, -- < 2457600000 1090000 802 >; -+ < 2457600000 1090000 802 >, -+ < 2572800000 1120000 827 >, -+ < 2726400000 1150000 900 >, -+ < 2880000000 1180000 937 >; - - qcom,speed3-pvs4-bin-v1 = - < 0 0 0 >, -@@ -1243,7 +1276,10 @@ - < 2265600000 1045000 716 >, - < 2342400000 1060000 751 >, - < 2419200000 1075000 786 >, -- < 2457600000 1080000 802 >; -+ < 2457600000 1080000 802 >, -+ < 2572800000 1110000 827 >, -+ < 2726400000 1140000 900 >, -+ < 2880000000 1170000 937 >; - - qcom,speed3-pvs5-bin-v1 = - < 0 0 0 >, -@@ -1278,7 +1314,10 @@ - < 2265600000 1035000 716 >, - < 2342400000 1050000 751 >, - < 2419200000 1065000 786 >, -- < 2457600000 1070000 802 >; -+ < 2457600000 1070000 802 >, -+ < 2572800000 1100000 827 >, -+ < 2726400000 1130000 900 >, -+ < 2880000000 1160000 937 >; - - qcom,speed3-pvs6-bin-v1 = - < 0 0 0 >, -@@ -1313,7 +1352,10 @@ - < 2265600000 1025000 716 >, - < 2342400000 1040000 751 >, - < 2419200000 1055000 786 >, -- < 2457600000 1060000 802 >; -+ < 2457600000 1060000 802 >, -+ < 2572800000 1090000 827 >, -+ < 2726400000 1120000 900 >, -+ < 2880000000 1150000 937 >; - - qcom,speed3-pvs7-bin-v1 = - < 0 0 0 >, -@@ -1348,7 +1390,10 @@ - < 2265600000 1015000 716 >, - < 2342400000 1030000 751 >, - < 2419200000 1045000 786 >, -- < 2457600000 1050000 802 >; -+ < 2457600000 1050000 802 >, -+ < 2572800000 1080000 827 >, -+ < 2726400000 1110000 900 >, -+ < 2880000000 1140000 937 >; - - qcom,speed3-pvs8-bin-v1 = - < 0 0 0 >, -@@ -1383,7 +1428,10 @@ - < 2265600000 1005000 716 >, - < 2342400000 1020000 751 >, - < 2419200000 1035000 786 >, -- < 2457600000 1040000 802 >; -+ < 2457600000 1040000 802 >, -+ < 2572800000 1070000 827 >, -+ < 2726400000 1100000 900 >, -+ < 2880000000 1130000 937 >; - - qcom,speed3-pvs9-bin-v1 = - < 0 0 0 >, -@@ -1418,7 +1466,10 @@ - < 2265600000 995000 716 >, - < 2342400000 1010000 751 >, - < 2419200000 1025000 786 >, -- < 2457600000 1030000 802 >; -+ < 2457600000 1030000 802 >, -+ < 2572800000 1060000 827 >, -+ < 2726400000 1090000 900 >, -+ < 2880000000 1120000 937 >; - - qcom,speed3-pvs10-bin-v1 = - < 0 0 0 >, -@@ -1453,7 +1504,10 @@ - < 2265600000 985000 716 >, - < 2342400000 1000000 751 >, - < 2419200000 1015000 786 >, -- < 2457600000 1020000 802 >; -+ < 2457600000 1020000 802 >, -+ < 2572800000 1050000 827 >, -+ < 2726400000 1080000 900 >, -+ < 2880000000 1110000 937 >; - - qcom,speed3-pvs11-bin-v1 = - < 0 0 0 >, -@@ -1488,7 +1542,10 @@ - < 2265600000 975000 716 >, - < 2342400000 990000 751 >, - < 2419200000 1005000 786 >, -- < 2457600000 1010000 802 >; -+ < 2457600000 1010000 802 >, -+ < 2572800000 1040000 827 >, -+ < 2726400000 1070000 900 >, -+ < 2880000000 1100000 937 >; - - qcom,speed3-pvs12-bin-v1 = - < 0 0 0 >, -@@ -1523,7 +1580,10 @@ - < 2265600000 965000 716 >, - < 2342400000 980000 751 >, - < 2419200000 995000 786 >, -- < 2457600000 1000000 802 >; -+ < 2457600000 1000000 802 >, -+ < 2572800000 1040000 827 >, -+ < 2726400000 1060000 900 >, -+ < 2880000000 1090000 937 >; - - qcom,speed3-pvs13-bin-v1 = - < 0 0 0 >, -@@ -1558,7 +1618,10 @@ - < 2265600000 955000 716 >, - < 2342400000 970000 751 >, - < 2419200000 985000 786 >, -- < 2457600000 990000 802 >; -+ < 2457600000 990000 802 >, -+ < 2572800000 1020000 827 >, -+ < 2726400000 1040000 900 >, -+ < 2880000000 1070000 937 >; - - qcom,speed3-pvs14-bin-v1 = - < 0 0 0 >, -@@ -1593,7 +1656,10 @@ - < 2265600000 945000 716 >, - < 2342400000 960000 751 >, - < 2419200000 975000 786 >, -- < 2457600000 980000 802 >; -+ < 2457600000 980000 802 >, -+ < 2572800000 1010000 827 >, -+ < 2726400000 1030000 900 >, -+ < 2880000000 1060000 937 >; - - qcom,speed3-pvs15-bin-v1 = - < 0 0 0 >, -@@ -1628,7 +1694,10 @@ - < 2265600000 935000 716 >, - < 2342400000 950000 751 >, - < 2419200000 965000 786 >, -- < 2457600000 970000 802 >; -+ < 2457600000 970000 802 >, -+ < 2572800000 1000000 827 >, -+ < 2726400000 1020000 900 >, -+ < 2880000000 1050000 937 >; - }; - - qcom,msm-cpufreq@0 { -@@ -1652,7 +1721,10 @@ - < 2265600 /* 931 MHz */ >, - < 2342400 /* 931 MHz */ >, - < 2419200 /* 931 MHz */ >, -- < 2457600 /* 931 MHz */ >; -+ < 2457600 /* 931 MHz */ >, -+ < 2572800 /* 931 MHz */ >, -+ < 2726400 /* 931 MHz */ >, -+ < 2880000 /* 931 MHz */ >; - }; - - i2c@f9928000 { /* BLSP-1 QUP-6 */ --- -2.10.2 - - -From 79da7e38c37f157c196a4cdb35415720f319b9b9 Mon Sep 17 00:00:00 2001 -From: "stefano.villa1976@gmail.com" -Date: Sat, 21 Feb 2015 01:24:45 -0700 -Subject: [PATCH 4/9] msm8974pro: dts: cpufreq: enable low steps for CPU - frequencies - ---- - arch/arm/boot/dts/msm8974pro.dtsi | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/arch/arm/boot/dts/msm8974pro.dtsi b/arch/arm/boot/dts/msm8974pro.dtsi -index 9d59eaf..a3c6552 100644 ---- a/arch/arm/boot/dts/msm8974pro.dtsi -+++ b/arch/arm/boot/dts/msm8974pro.dtsi -@@ -1706,9 +1706,13 @@ - qcom,cpufreq-table = - < 268800 /* 75 MHz */ >, - < 300000 /* 75 MHz */ >, -+ < 345600 /* 75 MHz */ >, - < 422400 /* 150 MHz */ >, -+ < 499200 /* 150 MHz */ >, -+ < 576000 /* 150 MHz */ >, - < 652800 /* 200 MHz */ >, - < 729600 /* 307 MHz */ >, -+ < 806400 /* 307 MHz */ >, - < 883200 /* 307 MHz */ >, - < 960000 /* 460 MHz */ >, - < 1036800 /* 460 MHz */ >, --- -2.10.2 - - -From e87bbd0e60f847c832e2e7f04f83a2c50e81ff7f Mon Sep 17 00:00:00 2001 -From: "stefano.villa1976@gmail.com" -Date: Sat, 21 Feb 2015 05:22:56 -0700 -Subject: [PATCH 5/9] msm8974pro: dts: cpufreq: enable middle steps for CPU - frequencies - ---- - arch/arm/boot/dts/msm8974pro.dtsi | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/arch/arm/boot/dts/msm8974pro.dtsi b/arch/arm/boot/dts/msm8974pro.dtsi -index a3c6552..d8073bc 100644 ---- a/arch/arm/boot/dts/msm8974pro.dtsi -+++ b/arch/arm/boot/dts/msm8974pro.dtsi -@@ -1716,10 +1716,14 @@ - < 883200 /* 307 MHz */ >, - < 960000 /* 460 MHz */ >, - < 1036800 /* 460 MHz */ >, -+ < 1113600 /* 460 MHz */ >, - < 1190400 /* 460 MHz */ >, - < 1267200 /* 614 MHz */ >, -+ < 1344000 /* 614 MHz */ >, -+ < 1420800 /* 614 MHz */ >, - < 1497600 /* 614 MHz */ >, - < 1574400 /* 800 MHz */ >, -+ < 1651200 /* 800 MHz */ >, - < 1728000 /* 800 MHz */ >, - < 1958400 /* 931 MHz */ >, - < 2265600 /* 931 MHz */ >, --- -2.10.2 - - -From a4518d0fbd58d59538b1b094e5b5b99ae9ed9938 Mon Sep 17 00:00:00 2001 -From: nikhil18 -Date: Sat, 19 Dec 2015 18:44:44 +0530 -Subject: [PATCH 6/9] add more cpu overclock frequencies - ---- - arch/arm/boot/dts/msm8974.dtsi | 3 +- - arch/arm/boot/dts/msm8974pro.dtsi | 214 +++++++++++++++++++++++++------------- - 2 files changed, 145 insertions(+), 72 deletions(-) - -diff --git a/arch/arm/boot/dts/msm8974.dtsi b/arch/arm/boot/dts/msm8974.dtsi -index 80907a3..949d47e 100644 ---- a/arch/arm/boot/dts/msm8974.dtsi -+++ b/arch/arm/boot/dts/msm8974.dtsi -@@ -1484,7 +1484,8 @@ - < 3509 /* 460 MHz */ >, - < 4684 /* 614 MHz */ >, - < 6103 /* 800 MHz */ >, -- < 7102 /* 931 MHz */ >; -+ < 7102 /* 931 MHz */ >, -+ < 7674 /* 1006 MHz */ >; - }; - - qcom,kraitbw-l2pm { -diff --git a/arch/arm/boot/dts/msm8974pro.dtsi b/arch/arm/boot/dts/msm8974pro.dtsi -index d8073bc..1ef99df 100644 ---- a/arch/arm/boot/dts/msm8974pro.dtsi -+++ b/arch/arm/boot/dts/msm8974pro.dtsi -@@ -347,9 +347,12 @@ - < 2342400000 1080000 734 >, - < 2419200000 1095000 769 >, - < 2457600000 1100000 785 >, -- < 2572800000 1120000 827 >, -- < 2726400000 1180000 900 >, -- < 2880000000 1210000 937 >; -+ < 2572800000 1145000 827 >, -+ < 2649600000 1185000 866 >, -+ < 2726400000 1205000 900 >, -+ < 2803200000 1215000 937 >, -+ < 2880000000 1235000 937 >, -+ < 2956800000 1250000 937 >; - - qcom,speed3-pvs1-bin-v0 = - < 0 0 0 >, -@@ -385,9 +388,12 @@ - < 2342400000 1055000 734 >, - < 2419200000 1070000 769 >, - < 2457600000 1075000 785 >, -- < 2572800000 1120000 827 >, -- < 2726400000 1180000 900 >, -- < 2880000000 1210000 937 >; -+ < 2572800000 1145000 827 >, -+ < 2649600000 1175000 866 >, -+ < 2726400000 1205000 900 >, -+ < 2803200000 1215000 937 >, -+ < 2880000000 1235000 937 >, -+ < 2956800000 1250000 937 >; - - qcom,speed3-pvs2-bin-v0 = - < 0 0 0 >, -@@ -423,9 +429,12 @@ - < 2342400000 1030000 734 >, - < 2419200000 1045000 769 >, - < 2457600000 1050000 785 >, -- < 2572800000 1100000 827 >, -- < 2726400000 1170000 900 >, -- < 2880000000 1200000 937 >; -+ < 2572800000 1125000 827 >, -+ < 2649600000 1165000 866 >, -+ < 2726400000 1195000 900 >, -+ < 2803200000 1205000 937 >, -+ < 2880000000 1225000 937 >, -+ < 2956800000 1240000 937 >; - - qcom,speed3-pvs3-bin-v0 = - < 0 0 0 >, -@@ -461,9 +470,13 @@ - < 2342400000 1005000 734 >, - < 2419200000 1020000 769 >, - < 2457600000 1025000 785 >, -- < 2572800000 1090000 827 >, -- < 2726400000 1160000 900 >, -- < 2880000000 1190000 937 >; -+ < 2572800000 1115000 827 >, -+ < 2649600000 1155000 866 >, -+ < 2726400000 1185000 900 >, -+ < 2803200000 1195000 937 >, -+ < 2880000000 1215000 937 >, -+ < 2956800000 1230000 937 >; -+ - - qcom,speed3-pvs4-bin-v0 = - < 0 0 0 >, -@@ -499,9 +512,12 @@ - < 2342400000 980000 734 >, - < 2419200000 995000 769 >, - < 2457600000 1000000 785 >, -- < 2572800000 1050000 827 >, -- < 2726400000 1150000 900 >, -- < 2880000000 1180000 937 >; -+ < 2572800000 1075000 827 >, -+ < 2649600000 1155000 866 >, -+ < 2726400000 1175000 900 >, -+ < 2803200000 1185000 937 >, -+ < 2880000000 1205000 937 >, -+ < 2956800000 1220000 937 >; - - qcom,speed3-pvs5-bin-v0 = - < 0 0 0 >, -@@ -537,9 +553,12 @@ - < 2342400000 955000 734 >, - < 2419200000 970000 769 >, - < 2457600000 975000 785 >, -- < 2572800000 1000000 827 >, -- < 2726400000 1150000 900 >, -- < 2880000000 1170000 937 >; -+ < 2572800000 1025000 827 >, -+ < 2649600000 1145000 866 >, -+ < 2726400000 1175000 900 >, -+ < 2803200000 1185000 937 >, -+ < 2880000000 1195000 937 >, -+ < 2956800000 1210000 937 >; - - qcom,speed3-pvs6-bin-v0 = - < 0 0 0 >, -@@ -575,9 +594,12 @@ - < 2342400000 930000 734 >, - < 2419200000 945000 769 >, - < 2457600000 950000 785 >, -- < 2572800000 985000 827 >, -- < 2726400000 1130000 900 >, -- < 2880000000 1150000 937 >; -+ < 2572800000 1010000 827 >, -+ < 2649600000 1135000 866 >, -+ < 2726400000 1155000 900 >, -+ < 2803200000 1165000 937 >, -+ < 2880000000 1175000 937 >, -+ < 2956800000 1200000 937 >; - - qcom,speed1-pvs0-bin-v1 = - < 0 0 0 >, -@@ -1125,9 +1147,12 @@ - < 2342400000 1100000 751 >, - < 2419200000 1115000 786 >, - < 2457600000 1120000 802 >, -- < 2572800000 1150000 827 >, -- < 2726400000 1200000 900 >, -- < 2880000000 1240000 937 >; -+ < 2572800000 1175000 827 >, -+ < 2649600000 1200000 866 >, -+ < 2726400000 1225000 900 >, -+ < 2803200000 1245000 937 >, -+ < 2880000000 1265000 937 >, -+ < 2956800000 1280000 937 >; - - qcom,speed3-pvs1-bin-v1 = - < 0 0 0 >, -@@ -1163,9 +1188,12 @@ - < 2342400000 1090000 751 >, - < 2419200000 1105000 786 >, - < 2457600000 1110000 802 >, -- < 2572800000 1140000 827 >, -- < 2726400000 1190000 900 >, -- < 2880000000 1220000 937 >; -+ < 2572800000 1165000 827 >, -+ < 2649600000 1190000 866 >, -+ < 2726400000 1215000 900 >, -+ < 2803200000 1225000 937 >, -+ < 2880000000 1245000 937 >, -+ < 2956800000 1260000 937 >; - - qcom,speed3-pvs2-bin-v1 = - < 0 0 0 >, -@@ -1201,9 +1229,12 @@ - < 2342400000 1080000 751 >, - < 2419200000 1095000 786 >, - < 2457600000 1100000 802 >, -- < 2572800000 1120000 827 >, -- < 2726400000 1160000 900 >, -- < 2880000000 1190000 937 >; -+ < 2572800000 1145000 827 >, -+ < 2649600000 1160000 866 >, -+ < 2726400000 1185000 900 >, -+ < 2803200000 1205000 937 >, -+ < 2880000000 1215000 937 >, -+ < 2956800000 1240000 937 >; - - qcom,speed3-pvs3-bin-v1 = - < 0 0 0 >, -@@ -1239,9 +1270,12 @@ - < 2342400000 1070000 751 >, - < 2419200000 1085000 786 >, - < 2457600000 1090000 802 >, -- < 2572800000 1120000 827 >, -- < 2726400000 1150000 900 >, -- < 2880000000 1180000 937 >; -+ < 2572800000 1145000 827 >, -+ < 2649600000 1160000 866 >, -+ < 2726400000 1175000 900 >, -+ < 2803200000 1195000 937 >, -+ < 2880000000 1205000 937 >, -+ < 2956800000 1220000 937 >; - - qcom,speed3-pvs4-bin-v1 = - < 0 0 0 >, -@@ -1277,9 +1311,12 @@ - < 2342400000 1060000 751 >, - < 2419200000 1075000 786 >, - < 2457600000 1080000 802 >, -- < 2572800000 1110000 827 >, -- < 2726400000 1140000 900 >, -- < 2880000000 1170000 937 >; -+ < 2572800000 1135000 827 >, -+ < 2649600000 1150000 866 >, -+ < 2726400000 1165000 900 >, -+ < 2803200000 1185000 937 >, -+ < 2880000000 1195000 937 >, -+ < 2956800000 1210000 937 >; - - qcom,speed3-pvs5-bin-v1 = - < 0 0 0 >, -@@ -1315,9 +1352,12 @@ - < 2342400000 1050000 751 >, - < 2419200000 1065000 786 >, - < 2457600000 1070000 802 >, -- < 2572800000 1100000 827 >, -- < 2726400000 1130000 900 >, -- < 2880000000 1160000 937 >; -+ < 2572800000 1125000 827 >, -+ < 2649600000 1140000 866 >, -+ < 2726400000 1155000 900 >, -+ < 2803200000 1175000 937 >, -+ < 2880000000 1185000 937 >, -+ < 2956800000 1200000 937 >; - - qcom,speed3-pvs6-bin-v1 = - < 0 0 0 >, -@@ -1353,9 +1393,12 @@ - < 2342400000 1040000 751 >, - < 2419200000 1055000 786 >, - < 2457600000 1060000 802 >, -- < 2572800000 1090000 827 >, -- < 2726400000 1120000 900 >, -- < 2880000000 1150000 937 >; -+ < 2572800000 1115000 827 >, -+ < 2649600000 1130000 866 >, -+ < 2726400000 1145000 900 >, -+ < 2803200000 1165000 937 >, -+ < 2880000000 1175000 937 >, -+ < 2956800000 1190000 937 >; - - qcom,speed3-pvs7-bin-v1 = - < 0 0 0 >, -@@ -1391,9 +1434,12 @@ - < 2342400000 1030000 751 >, - < 2419200000 1045000 786 >, - < 2457600000 1050000 802 >, -- < 2572800000 1080000 827 >, -- < 2726400000 1110000 900 >, -- < 2880000000 1140000 937 >; -+ < 2572800000 1105000 827 >, -+ < 2649600000 1120000 866 >, -+ < 2726400000 1135000 900 >, -+ < 2803200000 1155000 937 >, -+ < 2880000000 1165000 937 >, -+ < 2956800000 1180000 937 >; - - qcom,speed3-pvs8-bin-v1 = - < 0 0 0 >, -@@ -1429,9 +1475,12 @@ - < 2342400000 1020000 751 >, - < 2419200000 1035000 786 >, - < 2457600000 1040000 802 >, -- < 2572800000 1070000 827 >, -- < 2726400000 1100000 900 >, -- < 2880000000 1130000 937 >; -+ < 2572800000 1095000 827 >, -+ < 2649600000 1110000 866 >, -+ < 2726400000 1125000 900 >, -+ < 2803200000 1145000 937 >, -+ < 2880000000 1155000 937 >, -+ < 2956800000 1170000 937 >; - - qcom,speed3-pvs9-bin-v1 = - < 0 0 0 >, -@@ -1467,9 +1516,12 @@ - < 2342400000 1010000 751 >, - < 2419200000 1025000 786 >, - < 2457600000 1030000 802 >, -- < 2572800000 1060000 827 >, -- < 2726400000 1090000 900 >, -- < 2880000000 1120000 937 >; -+ < 2572800000 1085000 827 >, -+ < 2649600000 1100000 866 >, -+ < 2726400000 1115000 900 >, -+ < 2803200000 1135000 937 >, -+ < 2880000000 1145000 937 >, -+ < 2956800000 1160000 937 >; - - qcom,speed3-pvs10-bin-v1 = - < 0 0 0 >, -@@ -1505,9 +1557,12 @@ - < 2342400000 1000000 751 >, - < 2419200000 1015000 786 >, - < 2457600000 1020000 802 >, -- < 2572800000 1050000 827 >, -- < 2726400000 1080000 900 >, -- < 2880000000 1110000 937 >; -+ < 2572800000 1075000 827 >, -+ < 2649600000 1090000 866 >, -+ < 2726400000 1105000 900 >, -+ < 2803200000 1125000 937 >, -+ < 2880000000 1135000 937 >, -+ < 2956800000 1150000 937 >; - - qcom,speed3-pvs11-bin-v1 = - < 0 0 0 >, -@@ -1543,9 +1598,12 @@ - < 2342400000 990000 751 >, - < 2419200000 1005000 786 >, - < 2457600000 1010000 802 >, -- < 2572800000 1040000 827 >, -- < 2726400000 1070000 900 >, -- < 2880000000 1100000 937 >; -+ < 2572800000 1065000 827 >, -+ < 2649600000 1080000 866 >, -+ < 2726400000 1095000 900 >, -+ < 2803200000 1115000 937 >, -+ < 2880000000 1125000 937 >, -+ < 2956800000 1140000 937 >; - - qcom,speed3-pvs12-bin-v1 = - < 0 0 0 >, -@@ -1581,9 +1639,12 @@ - < 2342400000 980000 751 >, - < 2419200000 995000 786 >, - < 2457600000 1000000 802 >, -- < 2572800000 1040000 827 >, -- < 2726400000 1060000 900 >, -- < 2880000000 1090000 937 >; -+ < 2572800000 1065000 827 >, -+ < 2649600000 1075000 866 >, -+ < 2726400000 1085000 900 >, -+ < 2803200000 1105000 937 >, -+ < 2880000000 1115000 937 >, -+ < 2956800000 1130000 937 >; - - qcom,speed3-pvs13-bin-v1 = - < 0 0 0 >, -@@ -1619,9 +1680,12 @@ - < 2342400000 970000 751 >, - < 2419200000 985000 786 >, - < 2457600000 990000 802 >, -- < 2572800000 1020000 827 >, -- < 2726400000 1040000 900 >, -- < 2880000000 1070000 937 >; -+ < 2572800000 1045000 827 >, -+ < 2649600000 1055000 866 >, -+ < 2726400000 1065000 900 >, -+ < 2803200000 1085000 937 >, -+ < 2880000000 1095000 937 >, -+ < 2956800000 1110000 937 >; - - qcom,speed3-pvs14-bin-v1 = - < 0 0 0 >, -@@ -1657,9 +1721,12 @@ - < 2342400000 960000 751 >, - < 2419200000 975000 786 >, - < 2457600000 980000 802 >, -- < 2572800000 1010000 827 >, -- < 2726400000 1030000 900 >, -- < 2880000000 1060000 937 >; -+ < 2572800000 1035000 827 >, -+ < 2649600000 1045000 866 >, -+ < 2726400000 1055000 900 >, -+ < 2803200000 1075000 937 >, -+ < 2880000000 1085000 937 >, -+ < 2956800000 1100000 937 >; - - qcom,speed3-pvs15-bin-v1 = - < 0 0 0 >, -@@ -1695,16 +1762,19 @@ - < 2342400000 950000 751 >, - < 2419200000 965000 786 >, - < 2457600000 970000 802 >, -- < 2572800000 1000000 827 >, -- < 2726400000 1020000 900 >, -- < 2880000000 1050000 937 >; -+ < 2572800000 1025000 827 >, -+ < 2649600000 1035000 866 >, -+ < 2726400000 1045000 900 >, -+ < 2803200000 1065000 937 >, -+ < 2880000000 1075000 937 >, -+ < 2956800000 1090000 937 >; - }; - - qcom,msm-cpufreq@0 { - reg = <0 4>; - compatible = "qcom,msm-cpufreq"; - qcom,cpufreq-table = -- < 268800 /* 75 MHz */ >, -+ < 268800 /* 50 MHz */ >, - < 300000 /* 75 MHz */ >, - < 345600 /* 75 MHz */ >, - < 422400 /* 150 MHz */ >, -@@ -1725,13 +1795,15 @@ - < 1574400 /* 800 MHz */ >, - < 1651200 /* 800 MHz */ >, - < 1728000 /* 800 MHz */ >, -- < 1958400 /* 931 MHz */ >, -+ < 1958400 /* 800 MHz */ >, - < 2265600 /* 931 MHz */ >, - < 2342400 /* 931 MHz */ >, - < 2419200 /* 931 MHz */ >, - < 2457600 /* 931 MHz */ >, - < 2572800 /* 931 MHz */ >, -+ < 2649600 /* 931 MHz */ >, - < 2726400 /* 931 MHz */ >, -+ < 2803200 /* 931 MHz */ >, - < 2880000 /* 931 MHz */ >; - }; - --- -2.10.2 - - -From 2b75e5bcb9f3f8a72e6d2df812a7e06c52b525ae Mon Sep 17 00:00:00 2001 -From: Evisceration -Date: Mon, 8 Dec 2014 01:22:03 +0100 -Subject: [PATCH 7/9] dts: fix incorrect frequency - - * causes core 0 to be stuck at 2265 MHz - -Change-Id: I8d60596ca12255290d0f673666227ad28ea5514f ---- - arch/arm/boot/dts/msm8974-v2.dtsi | 2 +- - arch/arm/boot/dts/msm8974pro.dtsi | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/arch/arm/boot/dts/msm8974-v2.dtsi b/arch/arm/boot/dts/msm8974-v2.dtsi -index 91844c3..f98f53a 100644 ---- a/arch/arm/boot/dts/msm8974-v2.dtsi -+++ b/arch/arm/boot/dts/msm8974-v2.dtsi -@@ -123,7 +123,7 @@ - <1880000 2068000>, - <3008000 3309000>, - <3760000 4136000>, -- <4468000 2457000>; -+ <4468000 2457600>; - qcom,dec-ocmem-ab-ib = <0 0>, - <176000 519000>, - <456000 519000>, -diff --git a/arch/arm/boot/dts/msm8974pro.dtsi b/arch/arm/boot/dts/msm8974pro.dtsi -index 1ef99df..fed5f66 100644 ---- a/arch/arm/boot/dts/msm8974pro.dtsi -+++ b/arch/arm/boot/dts/msm8974pro.dtsi -@@ -1967,7 +1967,7 @@ - <1880000 2068000>, - <3008000 3309000>, - <3760000 4136000>, -- <4468000 2457000>; -+ <4468000 2457600>; - qcom,dec-ocmem-ab-ib = <0 0>, - <176000 519000>, - <456000 519000>, --- -2.10.2 - - -From 7fd5237c0cc7487b73ce9eec61853dcd126869c5 Mon Sep 17 00:00:00 2001 -From: WedyDQ10 -Date: Sun, 11 Jan 2015 20:55:23 +0900 -Subject: [PATCH 8/9] CPU Overclock over 2.889GHz - ---- - arch/arm/mach-msm/clock-krait-8974.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/arch/arm/mach-msm/clock-krait-8974.c b/arch/arm/mach-msm/clock-krait-8974.c -index f7ca20a..d96eb37 100644 ---- a/arch/arm/mach-msm/clock-krait-8974.c -+++ b/arch/arm/mach-msm/clock-krait-8974.c -@@ -44,7 +44,7 @@ static int hfpll_uv[] = { - static DEFINE_VDD_REGULATORS(vdd_hfpll, ARRAY_SIZE(hfpll_uv)/2, 2, - hfpll_uv, NULL); - --static unsigned long hfpll_fmax[] = { 0, 998400000, 1996800000, 2900000000UL }; -+static unsigned long hfpll_fmax[] = { 0, 998400000, 1996800000, 3100000000UL }; - - static struct hfpll_data hdata = { - .mode_offset = 0x0, -@@ -58,7 +58,7 @@ static struct hfpll_data hdata = { - .user_val = 0x8, - .low_vco_max_rate = 1248000000, - .min_rate = 537600000UL, -- .max_rate = 2900000000UL, -+ .max_rate = 3100000000UL, - }; - - static struct hfpll_clk hfpll0_clk = { --- -2.10.2 - - -From 4b054faec6161af8f34b3206d785b6b2e7d30bd3 Mon Sep 17 00:00:00 2001 -From: Tad -Date: Sat, 27 Feb 2016 16:58:05 -0500 -Subject: [PATCH 9/9] Enable 2.95Ghz overclock - -Change-Id: I022f7581ac48f184dbf5f2a9bb3f734f8335478f ---- - arch/arm/boot/dts/msm8974pro.dtsi | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/arch/arm/boot/dts/msm8974pro.dtsi b/arch/arm/boot/dts/msm8974pro.dtsi -index fed5f66..70fac47 100644 ---- a/arch/arm/boot/dts/msm8974pro.dtsi -+++ b/arch/arm/boot/dts/msm8974pro.dtsi -@@ -1804,7 +1804,8 @@ - < 2649600 /* 931 MHz */ >, - < 2726400 /* 931 MHz */ >, - < 2803200 /* 931 MHz */ >, -- < 2880000 /* 931 MHz */ >; -+ < 2880000 /* 931 MHz */ >, -+ < 2956800 /* 931 MHz */ >; - }; - - i2c@f9928000 { /* BLSP-1 QUP-6 */ --- -2.10.2 - diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_oneplus_msm8974.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_oneplus_msm8974.sh deleted file mode 100644 index 5d5891a3..00000000 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_oneplus_msm8974.sh +++ /dev/null @@ -1,52 +0,0 @@ -#!/bin/bash -cd $base"kernel/oneplus/msm8974" -git apply $cvePatchesLinux/0002-Copperhead-Kernel_Hardening/ANY/0001.patch -git apply $cvePatchesLinux/0010-Accelerated_AES/3.4/0002.patch -git apply $cvePatchesLinux/CVE-2014-9781/ANY/0001.patch -git apply $cvePatchesLinux/CVE-2014-9880/ANY/0001.patch -git apply $cvePatchesLinux/CVE-2016-0801/ANY/0001.patch -git apply $cvePatchesLinux/CVE-2016-2443/ANY/0001.patch -git apply $cvePatchesLinux/CVE-2016-6672/ANY/0001.patch -git apply $cvePatchesLinux/CVE-2016-7117/^4.5/0002.patch -git apply $cvePatchesLinux/CVE-2016-8404/ANY/0001.patch -git apply $cvePatchesLinux/CVE-2017-0510/3.4/0001.patch -git apply $cvePatchesLinux/CVE-2017-0524/ANY/0001.patch -git apply $cvePatchesLinux/CVE-2017-0610/ANY/0001.patch -git apply $cvePatchesLinux/CVE-2017-0611/3.4/0001.patch -git apply $cvePatchesLinux/CVE-2017-0648/ANY/0001.patch -git apply $cvePatchesLinux/CVE-2017-0750/ANY/0001.patch -git apply $cvePatchesLinux/CVE-2017-0751/ANY/0001.patch -git apply $cvePatchesLinux/CVE-2017-0786/ANY/0001.patch -git apply $cvePatchesLinux/CVE-2017-1000111/ANY/0001.patch -git apply $cvePatchesLinux/CVE-2017-1000380/^4.11/0001.patch -git apply $cvePatchesLinux/CVE-2017-11000/ANY/0002.patch -git apply $cvePatchesLinux/CVE-2017-11019/ANY/0001.patch -git apply $cvePatchesLinux/CVE-2017-11090/ANY/0001.patch -git apply $cvePatchesLinux/CVE-2017-11473/ANY/0001.patch -git apply $cvePatchesLinux/CVE-2017-12153/3.2-^3.16/0001.patch -git apply $cvePatchesLinux/CVE-2017-13080/ANY/0002.patch -git apply $cvePatchesLinux/CVE-2017-13215/ANY/0001.patch -git apply $cvePatchesLinux/CVE-2017-13246/ANY/0001.patch -git apply $cvePatchesLinux/CVE-2017-15265/^4.14/0001.patch -git apply $cvePatchesLinux/CVE-2017-16525/^4.13/0002.patch -git apply $cvePatchesLinux/CVE-2017-16526/^4.13/0001.patch -git apply $cvePatchesLinux/CVE-2017-16532/^4.13/0001.patch -git apply $cvePatchesLinux/CVE-2017-16533/^4.13/0001.patch -git apply $cvePatchesLinux/CVE-2017-16535/^4.13/0001.patch -git apply $cvePatchesLinux/CVE-2017-16537/^4.13/0001.patch -git apply $cvePatchesLinux/CVE-2017-16650/ANY/0001.patch -git apply $cvePatchesLinux/CVE-2017-16USB/ANY/0001.patch -git apply $cvePatchesLinux/CVE-2017-16USB/ANY/0005.patch -git apply $cvePatchesLinux/CVE-2017-16USB/ANY/0006.patch -git apply $cvePatchesLinux/CVE-2017-17558/ANY/0001.patch -git apply $cvePatchesLinux/CVE-2017-7487/ANY/0001.patch -git apply $cvePatchesLinux/CVE-2017-7533/3.4/0001.patch -git apply $cvePatchesLinux/CVE-2017-8246/3.4/0002.patch -git apply $cvePatchesLinux/CVE-2017-8247/ANY/0001.patch -git apply $cvePatchesLinux/CVE-2017-9242/^4.11/0001.patch -git apply $cvePatchesLinux/CVE-2017-9684/ANY/0001.patch -git apply $cvePatchesLinux/CVE-2017-9706/ANY/0001.patch -git apply $cvePatchesLinux/Untracked/ANY/0008-nfsd-check-for-oversized-NFSv2-v3-arguments.patch -git apply $cvePatchesLinux/CVE-2017-0750/ANY/0001.patch -editKernelLocalversion "-dos.p48" -cd $base diff --git a/Scripts/LineageOS-14.1/Functions.sh b/Scripts/LineageOS-14.1/Functions.sh index 004e6935..23519cfc 100644 --- a/Scripts/LineageOS-14.1/Functions.sh +++ b/Scripts/LineageOS-14.1/Functions.sh @@ -16,7 +16,7 @@ #along with this program. If not, see . patchAllKernels() { - startPatcher "kernel_amazon_hdx-common kernel_asus_msm8916 kernel_fairphone_msm8974 kernel_google_marlin kernel_htc_msm8974 kernel_htc_msm8994 kernel_lge_g3 kernel_lge_hammerhead kernel_lge_mako kernel_lge_msm8992 kernel_lge_msm8996 kernel_motorola_msm8916 kernel_motorola_msm8992 kernel_nextbit_msm8992 kernel_oneplus_msm8974 kernel_samsung_jf kernel_samsung_msm8974 kernel_samsung_smdk4412 kernel_samsung_universal8890"; + startPatcher "kernel_amazon_hdx-common kernel_asus_msm8916 kernel_fairphone_msm8974 kernel_google_marlin kernel_htc_msm8994 kernel_lge_g3 kernel_lge_hammerhead kernel_lge_mako kernel_lge_msm8992 kernel_lge_msm8996 kernel_motorola_msm8916 kernel_motorola_msm8992 kernel_nextbit_msm8992 kernel_samsung_jf kernel_samsung_msm8974 kernel_samsung_smdk4412 kernel_samsung_universal8890"; } export -f patchAllKernels; @@ -34,7 +34,6 @@ buildAll() { #Select devices are userdebug due to SELinux policy issues #TODO: Add victara, griffin, athene, us997, us996, pme, t0lte, hlte brunch lineage_d852-userdebug; - brunch lineage_bacon-user; brunch lineage_thor-userdebug; brunch lineage_mako-user; brunch lineage_clark-user; @@ -50,7 +49,6 @@ buildAll() { brunch lineage_i9305-user; brunch lineage_jfltexx-user; brunch lineage_klte-user; - brunch lineage_m8-user; brunch lineage_marlin-user; brunch lineage_n5110-user; brunch lineage_osprey-user; diff --git a/Scripts/LineageOS-14.1/Overclock.sh b/Scripts/LineageOS-14.1/Overclock.sh index 8614620d..950d3cdb 100644 --- a/Scripts/LineageOS-14.1/Overclock.sh +++ b/Scripts/LineageOS-14.1/Overclock.sh @@ -71,8 +71,5 @@ patch -p1 < $patches"android_kernel_common_msm8992/0005-Overclock.patch" patch -p1 < $patches"android_kernel_common_msm8992/0006-Overclock.patch" patch -p1 < $patches"android_kernel_common_msm8992/0007-Overclock.patch" -enter "kernel/oneplus/msm8974" -patch -p1 < $patches"android_kernel_oneplus_msm8974/0001-OverUnderClock-EXTREME.patch" #300Mhz -> 268Mhz, 2.45Ghz -> 2.95Ghz =+2.02Ghz XXX: Not 100% stable under intense workloads - cd $base echo "Overclocks applied!" diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_google_marlin.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_google_marlin.sh index 765bd4b8..158527d7 100644 --- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_google_marlin.sh +++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_google_marlin.sh @@ -29,7 +29,7 @@ git apply $cvePatchesLinux/0002-Copperhead-Kernel_Hardening/3.18/0044.patch git apply $cvePatchesLinux/0002-Copperhead-Kernel_Hardening/3.18/0045.patch git apply $cvePatchesLinux/0002-Copperhead-Kernel_Hardening/3.18/0046.patch git apply $cvePatchesLinux/0002-Copperhead-Kernel_Hardening/3.18/0047.patch -git apply $cvePatchesLinux/0002-Copperhead-Kernel_Hardening/3.18/0048.patch +#git apply $cvePatchesLinux/0002-Copperhead-Kernel_Hardening/3.18/0048.patch git apply $cvePatchesLinux/0002-Copperhead-Kernel_Hardening/3.18/0049.patch git apply $cvePatchesLinux/0002-Copperhead-Kernel_Hardening/3.18/0050.patch git apply $cvePatchesLinux/0002-Copperhead-Kernel_Hardening/ANY/0001.patch diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_htc_msm8974.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_htc_msm8974.sh similarity index 100% rename from Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_htc_msm8974.sh rename to Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_htc_msm8974.sh diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_lge_msm8996.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_lge_msm8996.sh new file mode 100644 index 00000000..2af71d82 --- /dev/null +++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_lge_msm8996.sh @@ -0,0 +1,89 @@ +#!/bin/bash +cd $base"kernel/lge/msm8996" +git apply $cvePatchesLinux/0002-Copperhead-Kernel_Hardening/3.18/0019.patch +git apply $cvePatchesLinux/0002-Copperhead-Kernel_Hardening/3.18/0020.patch +git apply $cvePatchesLinux/0002-Copperhead-Kernel_Hardening/3.18/0022.patch +git apply $cvePatchesLinux/0002-Copperhead-Kernel_Hardening/3.18/0023.patch +git apply $cvePatchesLinux/0002-Copperhead-Kernel_Hardening/3.18/0025.patch +git apply $cvePatchesLinux/0002-Copperhead-Kernel_Hardening/3.18/0026.patch +git apply $cvePatchesLinux/0002-Copperhead-Kernel_Hardening/3.18/0027.patch +git apply $cvePatchesLinux/0002-Copperhead-Kernel_Hardening/3.18/0028.patch +git apply $cvePatchesLinux/0002-Copperhead-Kernel_Hardening/3.18/0029.patch +git apply $cvePatchesLinux/0002-Copperhead-Kernel_Hardening/3.18/0030.patch +git apply $cvePatchesLinux/0002-Copperhead-Kernel_Hardening/3.18/0031.patch +git apply $cvePatchesLinux/0002-Copperhead-Kernel_Hardening/3.18/0032.patch +git apply $cvePatchesLinux/0002-Copperhead-Kernel_Hardening/3.18/0033.patch +git apply $cvePatchesLinux/0002-Copperhead-Kernel_Hardening/3.18/0034.patch +git apply $cvePatchesLinux/0002-Copperhead-Kernel_Hardening/3.18/0035.patch +git apply $cvePatchesLinux/0002-Copperhead-Kernel_Hardening/3.18/0036.patch +git apply $cvePatchesLinux/0002-Copperhead-Kernel_Hardening/3.18/0037.patch +#git apply $cvePatchesLinux/0002-Copperhead-Kernel_Hardening/3.18/0038.patch +#git apply $cvePatchesLinux/0002-Copperhead-Kernel_Hardening/3.18/0039.patch +git apply $cvePatchesLinux/0002-Copperhead-Kernel_Hardening/3.18/0040.patch +git apply $cvePatchesLinux/0002-Copperhead-Kernel_Hardening/3.18/0041.patch +git apply $cvePatchesLinux/0002-Copperhead-Kernel_Hardening/3.18/0042.patch +git apply $cvePatchesLinux/0002-Copperhead-Kernel_Hardening/3.18/0043.patch +git apply $cvePatchesLinux/0002-Copperhead-Kernel_Hardening/3.18/0045.patch +git apply $cvePatchesLinux/0002-Copperhead-Kernel_Hardening/3.18/0046.patch +git apply $cvePatchesLinux/0002-Copperhead-Kernel_Hardening/3.18/0050.patch +git apply $cvePatchesLinux/0010-Accelerated_AES/3.10+/0011.patch +git apply $cvePatchesLinux/0010-Accelerated_AES/3.10+/0012.patch +git apply $cvePatchesLinux/CVE-2014-9900/ANY/0001.patch +git apply $cvePatchesLinux/CVE-2015-2041/^3.19/0002.patch +git apply $cvePatchesLinux/CVE-2015-7515/^4.4/0002.patch +git apply $cvePatchesLinux/CVE-2016-2188/ANY/0001.patch +git apply $cvePatchesLinux/CVE-2016-2188/ANY/0002.patch +git apply $cvePatchesLinux/CVE-2016-2549/^4.4/0001.patch +git apply $cvePatchesLinux/CVE-2016-3136/ANY/0001.patch +git apply $cvePatchesLinux/CVE-2016-3137/ANY/0001.patch +git apply $cvePatchesLinux/CVE-2016-3138/ANY/0001.patch +git apply $cvePatchesLinux/CVE-2016-3140/ANY/0001.patch +git apply $cvePatchesLinux/CVE-2016-3857/ANY/0001.patch +git apply $cvePatchesLinux/CVE-2016-6672/ANY/0001.patch +git apply $cvePatchesLinux/CVE-2016-6693/ANY/0001.patch +git apply $cvePatchesLinux/CVE-2016-6696/ANY/0001.patch +git apply $cvePatchesLinux/CVE-2016-8394/ANY/0001.patch +git apply $cvePatchesLinux/CVE-2016-GadgetFS/ANY/0007.patch +git apply $cvePatchesLinux/CVE-2016-GadgetFS/ANY/0008.patch +git apply $cvePatchesLinux/CVE-2016-GadgetFS/ANY/0009.patch +git apply $cvePatchesLinux/CVE-2016-GadgetFS/ANY/0010.patch +git apply $cvePatchesLinux/CVE-2017-0610/ANY/0002.patch +git apply $cvePatchesLinux/CVE-2017-0750/ANY/0001.patch +git apply $cvePatchesLinux/CVE-2017-11031/3.18/0001.patch +git apply $cvePatchesLinux/CVE-2017-11045/ANY/0001.patch +git apply $cvePatchesLinux/CVE-2017-11075/ANY/0001.patch +git apply $cvePatchesLinux/CVE-2017-11093/3.18/0001.patch +git apply $cvePatchesLinux/CVE-2017-13162/3.18/0001.patch +git apply $cvePatchesLinux/CVE-2017-13245/ANY/0001.patch +git apply $cvePatchesLinux/CVE-2017-13246/ANY/0001.patch +git apply $cvePatchesLinux/CVE-2017-14880/3.18/0002.patch +git apply $cvePatchesLinux/CVE-2017-14891/ANY/0001.patch +git apply $cvePatchesLinux/CVE-2017-14892/ANY/0001.patch +git apply $cvePatchesLinux/CVE-2017-15826/3.18/0001.patch +git apply $cvePatchesLinux/CVE-2017-15834/ANY/0001.patch +git apply $cvePatchesLinux/CVE-2017-15846/ANY/0001.patch +git apply $cvePatchesLinux/CVE-2017-15846/ANY/0002.patch +git apply $cvePatchesLinux/CVE-2017-15850/ANY/0001.patch +git apply $cvePatchesLinux/CVE-2017-16650/ANY/0001.patch +git apply $cvePatchesLinux/CVE-2017-16USB/ANY/0005.patch +git apply $cvePatchesLinux/CVE-2017-16USB/ANY/0006.patch +git apply $cvePatchesLinux/CVE-2017-16USB/ANY/0009.patch +git apply $cvePatchesLinux/CVE-2017-17769/ANY/0001.patch +git apply $cvePatchesLinux/CVE-2017-18061/ANY/0001.patch +git apply $cvePatchesLinux/CVE-2017-18066/ANY/0001.patch +git apply $cvePatchesLinux/CVE-2017-5669/^4.9/0001.patch +git apply $cvePatchesLinux/CVE-2017-5972/ANY/0002.patch +git apply $cvePatchesLinux/CVE-2017-6001/^4.9/0002.patch +git apply $cvePatchesLinux/CVE-2017-6348/^4.9/0001.patch +git apply $cvePatchesLinux/CVE-2018-3560/ANY/0001.patch +git apply $cvePatchesLinux/CVE-2018-3563/ANY/0002.patch +git apply $cvePatchesLinux/CVE-2018-3599/ANY/0001.patch +git apply $cvePatchesLinux/CVE-2018-5825/3.18/0002.patch +git apply $cvePatchesLinux/LVT-2017-0001/3.18/0004.patch +git apply $cvePatchesLinux/LVT-2017-0002/3.18/0003.patch +git apply $cvePatchesLinux/CVE-2016-6693/ANY/0001.patch +git apply $cvePatchesLinux/CVE-2016-6696/ANY/0001.patch +git apply $cvePatchesLinux/CVE-2017-0610/ANY/0001.patch +git apply $cvePatchesLinux/CVE-2017-0750/ANY/0001.patch +editKernelLocalversion "-dos.p85" +cd $base diff --git a/Scripts/LineageOS-15.1/Functions.sh b/Scripts/LineageOS-15.1/Functions.sh index 1a4bd193..174df483 100644 --- a/Scripts/LineageOS-15.1/Functions.sh +++ b/Scripts/LineageOS-15.1/Functions.sh @@ -43,9 +43,9 @@ buildAll() { brunch lineage_d855-userdebug; brunch lineage_flo-user; brunch lineage_flounder-user; - brunch lineage_h850-userdebug; + #brunch lineage_h850-userdebug; #prot_sect_kernel undefined #brunch lineage_hammerhead-user; #find: `hardware/cyanogen/cmhw': No such file or directory - #brunch lineage_marlin-user; #include/linux/string.h:287:4: error: call to '__read_overflow2' declared with attribute error: detected read beyond size of object passed as 2nd parameter + #brunch lineage_marlin-user; brunch lineage_m8-user; #brunch lineage_sailfish-user; brunch lineage_shamu-user; @@ -54,8 +54,7 @@ export -f buildAll; patchWorkspace() { source build/envsetup.sh; - repopick 205021 206123 211008 211049; #Cherry picks - repopick -t o_asb_4-2018; + repopick 205021 206123 211008 211049 209030; #Cherry picks #repopick -t calendar-o; source $scripts/Patch.sh; diff --git a/Scripts/LineageOS-15.1/Patch.sh b/Scripts/LineageOS-15.1/Patch.sh index d4a0ac13..219b362e 100755 --- a/Scripts/LineageOS-15.1/Patch.sh +++ b/Scripts/LineageOS-15.1/Patch.sh @@ -119,10 +119,10 @@ enterAndClear "packages/apps/GsfProxy" sed -i 's/ext.androidBuildVersionTools = "24.0.3"/ext.androidBuildVersionTools = "25.0.3"/' build.gradle; enterAndClear "packages/apps/LineageParts" -git revert 7ec4be432a9585833f48543a1fff859497e2b4ee #LOSCoins malware rm -rf src/org/lineageos/lineageparts/lineagestats/ res/xml/anonymous_stats.xml res/xml/preview_data.xml #Nuke part of the analytics sed -i 's|config_showWeatherMenu">true|config_showWeatherMenu">false|' res/values/config.xml; #Disable Weather patch -p1 < $patches"android_packages_apps_LineageParts/0001-Remove_Analytics.patch" #Remove analytics +rm AndroidManifest.xml.orig res/values/*.xml.orig; enterAndClear "packages/apps/Settings" git revert a96df110e84123fe1273bff54feca3b4ca484dcd @@ -160,7 +160,6 @@ enterAndClear "system/vold" patch -p1 < $patches"android_system_vold/0001-AES256.patch" #Add a variable for enabling AES-256 bit encryption enterAndClear "vendor/lineage" -git revert c9c7968e597c105cb5ee69c4234d91070edd65fc #LOSCoins malware rm -rf overlay/common/vendor/lineage-sdk/packages #Remove analytics awk -i inplace '!/50-lineage.sh/' config/common.mk; #Make sure our hosts is always used patch -p1 < $patches"android_vendor_lineage/0001-SCE.patch" #Include our extras such as MicroG and F-Droid diff --git a/Scripts/LineageOS-15.1/Rebrand.sh b/Scripts/LineageOS-15.1/Rebrand.sh index 85ff716c..81787b06 100644 --- a/Scripts/LineageOS-15.1/Rebrand.sh +++ b/Scripts/LineageOS-15.1/Rebrand.sh @@ -21,6 +21,7 @@ echo "Rebranding..." enter "bootable/recovery" sed -i 's|Android Recovery|DivestOS Recovery|' *_ui.cpp; +sed -i 's|LineageOS|DivestOS|' ui.cpp; #TODO: Rebrand the rest of the recovery enter "build/make"