imx: copy patches 5.15 to 6.1
authorTim Harvey <tharvey@gateworks.com>
Mon, 8 Jan 2024 21:25:36 +0000 (13:25 -0800)
committerChristian Marangi <ansuelsmth@gmail.com>
Fri, 2 Feb 2024 16:31:39 +0000 (17:31 +0100)
copy 5.15 patches excluding some that need manual rework touching
non-upstream led props.

Signed-off-by: Tim Harvey <tharvey@gateworks.com>
target/linux/imx/patches-6.1/100-bootargs.patch [new file with mode: 0644]
target/linux/imx/patches-6.1/311-ARM-imx7d-pico-pi.dts-add-default-stdout-path.patch [new file with mode: 0644]

diff --git a/target/linux/imx/patches-6.1/100-bootargs.patch b/target/linux/imx/patches-6.1/100-bootargs.patch
new file mode 100644 (file)
index 0000000..cf63a3b
--- /dev/null
@@ -0,0 +1,11 @@
+--- a/arch/arm/boot/dts/imx6dl-wandboard.dts
++++ b/arch/arm/boot/dts/imx6dl-wandboard.dts
+@@ -16,4 +16,8 @@
+               device_type = "memory";
+               reg = <0x10000000 0x40000000>;
+       };
++
++      chosen {
++              bootargs = "console=ttymxc0,115200";
++      };
+ };
diff --git a/target/linux/imx/patches-6.1/311-ARM-imx7d-pico-pi.dts-add-default-stdout-path.patch b/target/linux/imx/patches-6.1/311-ARM-imx7d-pico-pi.dts-add-default-stdout-path.patch
new file mode 100644 (file)
index 0000000..5248e8c
--- /dev/null
@@ -0,0 +1,23 @@
+From 6e8e5ccfbee7a531b035ffce3f95f3901946fa9d Mon Sep 17 00:00:00 2001
+From: Robert Nelson <robertcnelson@gmail.com>
+Date: Wed, 9 Jan 2019 14:33:24 -0600
+Subject: [PATCH] ARM: imx7d-pico-pi.dts: add default stdout-path
+
+Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
+---
+ arch/arm/boot/dts/imx7d-pico-pi.dts | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+--- a/arch/arm/boot/dts/imx7d-pico-pi.dts
++++ b/arch/arm/boot/dts/imx7d-pico-pi.dts
+@@ -16,6 +16,10 @@
+               label-mac-device = &fec1;
+       };
++      chosen {
++              stdout-path = "serial4:115200n8";
++      };
++
+       leds {
+               compatible = "gpio-leds";
+               pinctrl-names = "default";