aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/imx6
diff options
context:
space:
mode:
authorKoen Vandeputte <koen.vandeputte@ncentric.com>2019-04-18 15:05:04 +0200
committerKoen Vandeputte <koen.vandeputte@ncentric.com>2019-04-22 21:15:17 +0200
commit022dfdc41c7a328f035b8930e763576c2c2b3a13 (patch)
treec8bd1228f9bb82d54849b8c7311eb098206467cc /target/linux/imx6
parentda5bd73d702e7cb9f7da174977b606ca12ffd96b (diff)
downloadupstream-022dfdc41c7a328f035b8930e763576c2c2b3a13.tar.gz
upstream-022dfdc41c7a328f035b8930e763576c2c2b3a13.tar.bz2
upstream-022dfdc41c7a328f035b8930e763576c2c2b3a13.zip
kernel: bump 4.19 to 4.19.35
Refreshed all patches. Fixes: - CVE-2019-3887 New symbol: - CONFIG_LDISC_AUTOLOAD Compile-tested on: cns3xxx, imx6 Runtime-tested on: cns3xxx, imx6 Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/imx6')
-rw-r--r--target/linux/imx6/patches-4.19/301-apalis-ixora-dts-leds.patch8
-rw-r--r--target/linux/imx6/patches-4.19/302-apalis-ixora-dts-reset-button.patch16
2 files changed, 12 insertions, 12 deletions
diff --git a/target/linux/imx6/patches-4.19/301-apalis-ixora-dts-leds.patch b/target/linux/imx6/patches-4.19/301-apalis-ixora-dts-leds.patch
index acec1e8e3d..bae9df1734 100644
--- a/target/linux/imx6/patches-4.19/301-apalis-ixora-dts-leds.patch
+++ b/target/linux/imx6/patches-4.19/301-apalis-ixora-dts-leds.patch
@@ -14,8 +14,8 @@ Signed-off-by: Petr Štetiar <ynezz@true.cz>
+ led-upgrade = &led_upgrade;
};
- gpio-keys {
-@@ -123,22 +127,22 @@
+ chosen {
+@@ -127,22 +131,22 @@
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_leds_ixora>;
@@ -54,8 +54,8 @@ Signed-off-by: Petr Štetiar <ynezz@true.cz>
+ led-upgrade = &led_upgrade;
};
- gpio-keys {
-@@ -124,22 +128,22 @@
+ chosen {
+@@ -128,22 +132,22 @@
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_leds_ixora>;
diff --git a/target/linux/imx6/patches-4.19/302-apalis-ixora-dts-reset-button.patch b/target/linux/imx6/patches-4.19/302-apalis-ixora-dts-reset-button.patch
index ede872fb62..da9de296a2 100644
--- a/target/linux/imx6/patches-4.19/302-apalis-ixora-dts-reset-button.patch
+++ b/target/linux/imx6/patches-4.19/302-apalis-ixora-dts-reset-button.patch
@@ -4,7 +4,7 @@ Signed-off-by: Petr Štetiar <ynezz@true.cz>
--- a/arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts
+++ b/arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts
-@@ -70,7 +70,7 @@
+@@ -74,7 +74,7 @@
gpio-keys {
compatible = "gpio-keys";
pinctrl-names = "default";
@@ -13,7 +13,7 @@ Signed-off-by: Petr Štetiar <ynezz@true.cz>
wakeup {
label = "Wake-Up";
-@@ -79,6 +79,13 @@
+@@ -83,6 +83,13 @@
debounce-interval = <10>;
wakeup-source;
};
@@ -26,8 +26,8 @@ Signed-off-by: Petr Štetiar <ynezz@true.cz>
+ };
};
- lcd_display: display@di0 {
-@@ -292,4 +299,10 @@
+ lcd_display: disp0 {
+@@ -296,4 +303,10 @@
MX6QDL_PAD_NANDF_D2__GPIO2_IO02 0x1b0b0
>;
};
@@ -40,7 +40,7 @@ Signed-off-by: Petr Štetiar <ynezz@true.cz>
};
--- a/arch/arm/boot/dts/imx6q-apalis-ixora.dts
+++ b/arch/arm/boot/dts/imx6q-apalis-ixora.dts
-@@ -69,7 +69,7 @@
+@@ -73,7 +73,7 @@
gpio-keys {
compatible = "gpio-keys";
pinctrl-names = "default";
@@ -49,7 +49,7 @@ Signed-off-by: Petr Štetiar <ynezz@true.cz>
wakeup {
label = "Wake-Up";
-@@ -78,6 +78,13 @@
+@@ -82,6 +82,13 @@
debounce-interval = <10>;
wakeup-source;
};
@@ -62,8 +62,8 @@ Signed-off-by: Petr Štetiar <ynezz@true.cz>
+ };
};
- lcd_display: display@di0 {
-@@ -293,4 +300,10 @@
+ lcd_display: disp0 {
+@@ -297,4 +304,10 @@
MX6QDL_PAD_NANDF_D2__GPIO2_IO02 0x1b0b0
>;
};