From 63a7cf67912a9fa7ad4790a13e88aad8c3fb3ba9 Mon Sep 17 00:00:00 2001 From: Christian Lamparter Date: Sat, 22 Sep 2018 00:38:37 +0200 Subject: [PATCH] treewide: replace 'linux, stdout-path' with 'stdout-path' This follows a similar upstream patch by Rob Herring: |commit 78e5dfea84dc15d69940831b3981b3014d17222e |Author: Rob Herring |Date: Wed Feb 28 16:44:06 2018 -0600 | powerpc: dts: replace 'linux,stdout-path' with 'stdout-path' | | 'linux,stdout-path' has been deprecated for some time in favor of | 'stdout-path'. Now dtc will warn on occurrences of 'linux,stdout-path'. | Search and replace all the of occurrences with 'stdout-path'. Signed-off-by: Christian Lamparter --- target/linux/apm821xx/dts/meraki-mr24.dts | 2 +- target/linux/apm821xx/dts/meraki-mx60.dts | 2 +- target/linux/apm821xx/dts/netgear-wndr4700.dts | 2 +- .../ipq806x/files-4.14/arch/arm/boot/dts/qcom-ipq8064-ap148.dts | 2 +- .../ipq806x/files-4.14/arch/arm/boot/dts/qcom-ipq8064-c2600.dts | 2 +- .../ipq806x/files-4.14/arch/arm/boot/dts/qcom-ipq8064-d7800.dts | 2 +- .../ipq806x/files-4.14/arch/arm/boot/dts/qcom-ipq8064-db149.dts | 2 +- .../files-4.14/arch/arm/boot/dts/qcom-ipq8064-ea8500.dts | 2 +- .../ipq806x/files-4.14/arch/arm/boot/dts/qcom-ipq8064-r7500.dts | 2 +- .../files-4.14/arch/arm/boot/dts/qcom-ipq8064-r7500v2.dts | 2 +- .../files-4.14/arch/arm/boot/dts/qcom-ipq8064-vr2600v.dts | 2 +- .../files-4.14/arch/arm/boot/dts/qcom-ipq8064-wg2600hp.dts | 2 +- .../files-4.14/arch/arm/boot/dts/qcom-ipq8064-wpq864.dts | 2 +- .../files-4.14/arch/arm/boot/dts/qcom-ipq8065-nbg6817.dts | 2 +- .../ipq806x/files-4.14/arch/arm/boot/dts/qcom-ipq8065-r7800.dts | 2 +- .../linux/mpc85xx/files/arch/powerpc/boot/dts/tl-wdr4900-v1.dts | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/target/linux/apm821xx/dts/meraki-mr24.dts b/target/linux/apm821xx/dts/meraki-mr24.dts index 7152c0296c..63cb88b8f1 100644 --- a/target/linux/apm821xx/dts/meraki-mr24.dts +++ b/target/linux/apm821xx/dts/meraki-mr24.dts @@ -27,7 +27,7 @@ }; chosen { - linux,stdout-path = "/plb/opb/serial@ef600400"; + stdout-path = "/plb/opb/serial@ef600400"; }; }; diff --git a/target/linux/apm821xx/dts/meraki-mx60.dts b/target/linux/apm821xx/dts/meraki-mx60.dts index 042c1c4303..881d9335a1 100644 --- a/target/linux/apm821xx/dts/meraki-mx60.dts +++ b/target/linux/apm821xx/dts/meraki-mx60.dts @@ -27,7 +27,7 @@ }; chosen { - linux,stdout-path = "/plb/opb/serial@ef600400"; + stdout-path = "/plb/opb/serial@ef600400"; }; }; diff --git a/target/linux/apm821xx/dts/netgear-wndr4700.dts b/target/linux/apm821xx/dts/netgear-wndr4700.dts index 4a252cf0b8..171b7e34d6 100644 --- a/target/linux/apm821xx/dts/netgear-wndr4700.dts +++ b/target/linux/apm821xx/dts/netgear-wndr4700.dts @@ -26,7 +26,7 @@ }; chosen { - linux,stdout-path = "/plb/opb/serial@ef600300"; + stdout-path = "/plb/opb/serial@ef600300"; }; thermal-zones { diff --git a/target/linux/ipq806x/files-4.14/arch/arm/boot/dts/qcom-ipq8064-ap148.dts b/target/linux/ipq806x/files-4.14/arch/arm/boot/dts/qcom-ipq8064-ap148.dts index 3eaa90db2e..655f9fba37 100644 --- a/target/linux/ipq806x/files-4.14/arch/arm/boot/dts/qcom-ipq8064-ap148.dts +++ b/target/linux/ipq806x/files-4.14/arch/arm/boot/dts/qcom-ipq8064-ap148.dts @@ -25,7 +25,7 @@ }; chosen { - linux,stdout-path = "serial0:115200n8"; + stdout-path = "serial0:115200n8"; }; soc { diff --git a/target/linux/ipq806x/files-4.14/arch/arm/boot/dts/qcom-ipq8064-c2600.dts b/target/linux/ipq806x/files-4.14/arch/arm/boot/dts/qcom-ipq8064-c2600.dts index c32115934f..0db451958b 100644 --- a/target/linux/ipq806x/files-4.14/arch/arm/boot/dts/qcom-ipq8064-c2600.dts +++ b/target/linux/ipq806x/files-4.14/arch/arm/boot/dts/qcom-ipq8064-c2600.dts @@ -32,7 +32,7 @@ }; chosen { - linux,stdout-path = "serial0:115200n8"; + stdout-path = "serial0:115200n8"; }; soc { diff --git a/target/linux/ipq806x/files-4.14/arch/arm/boot/dts/qcom-ipq8064-d7800.dts b/target/linux/ipq806x/files-4.14/arch/arm/boot/dts/qcom-ipq8064-d7800.dts index 7c829babbb..14ed6fb2f8 100644 --- a/target/linux/ipq806x/files-4.14/arch/arm/boot/dts/qcom-ipq8064-d7800.dts +++ b/target/linux/ipq806x/files-4.14/arch/arm/boot/dts/qcom-ipq8064-d7800.dts @@ -33,7 +33,7 @@ chosen { bootargs = "rootfstype=squashfs noinitrd"; - linux,stdout-path = "serial0:115200n8"; + stdout-path = "serial0:115200n8"; }; soc { diff --git a/target/linux/ipq806x/files-4.14/arch/arm/boot/dts/qcom-ipq8064-db149.dts b/target/linux/ipq806x/files-4.14/arch/arm/boot/dts/qcom-ipq8064-db149.dts index 562659fef9..f4cface193 100644 --- a/target/linux/ipq806x/files-4.14/arch/arm/boot/dts/qcom-ipq8064-db149.dts +++ b/target/linux/ipq806x/files-4.14/arch/arm/boot/dts/qcom-ipq8064-db149.dts @@ -20,7 +20,7 @@ }; chosen { - linux,stdout-path = "serial0:115200n8"; + stdout-path = "serial0:115200n8"; }; soc { diff --git a/target/linux/ipq806x/files-4.14/arch/arm/boot/dts/qcom-ipq8064-ea8500.dts b/target/linux/ipq806x/files-4.14/arch/arm/boot/dts/qcom-ipq8064-ea8500.dts index 642c1d91b1..900d602ede 100644 --- a/target/linux/ipq806x/files-4.14/arch/arm/boot/dts/qcom-ipq8064-ea8500.dts +++ b/target/linux/ipq806x/files-4.14/arch/arm/boot/dts/qcom-ipq8064-ea8500.dts @@ -33,7 +33,7 @@ chosen { bootargs = "console=ttyMSM0,115200n8"; - linux,stdout-path = "serial0:115200n8"; + stdout-path = "serial0:115200n8"; append-rootblock = "ubi.mtd="; /* append to bootargs adding the root deviceblock nbr from bootloader */ }; diff --git a/target/linux/ipq806x/files-4.14/arch/arm/boot/dts/qcom-ipq8064-r7500.dts b/target/linux/ipq806x/files-4.14/arch/arm/boot/dts/qcom-ipq8064-r7500.dts index 1c7cf792c3..5a3056807a 100644 --- a/target/linux/ipq806x/files-4.14/arch/arm/boot/dts/qcom-ipq8064-r7500.dts +++ b/target/linux/ipq806x/files-4.14/arch/arm/boot/dts/qcom-ipq8064-r7500.dts @@ -34,7 +34,7 @@ chosen { bootargs = "rootfstype=squashfs noinitrd"; - linux,stdout-path = "serial0:115200n8"; + stdout-path = "serial0:115200n8"; }; soc { diff --git a/target/linux/ipq806x/files-4.14/arch/arm/boot/dts/qcom-ipq8064-r7500v2.dts b/target/linux/ipq806x/files-4.14/arch/arm/boot/dts/qcom-ipq8064-r7500v2.dts index aafe258c83..1005ea137a 100644 --- a/target/linux/ipq806x/files-4.14/arch/arm/boot/dts/qcom-ipq8064-r7500v2.dts +++ b/target/linux/ipq806x/files-4.14/arch/arm/boot/dts/qcom-ipq8064-r7500v2.dts @@ -38,7 +38,7 @@ chosen { bootargs = "rootfstype=squashfs noinitrd"; - linux,stdout-path = "serial0:115200n8"; + stdout-path = "serial0:115200n8"; }; soc { diff --git a/target/linux/ipq806x/files-4.14/arch/arm/boot/dts/qcom-ipq8064-vr2600v.dts b/target/linux/ipq806x/files-4.14/arch/arm/boot/dts/qcom-ipq8064-vr2600v.dts index e8f74c35de..56421b25e6 100644 --- a/target/linux/ipq806x/files-4.14/arch/arm/boot/dts/qcom-ipq8064-vr2600v.dts +++ b/target/linux/ipq806x/files-4.14/arch/arm/boot/dts/qcom-ipq8064-vr2600v.dts @@ -32,7 +32,7 @@ }; chosen { - linux,stdout-path = "serial0:115200n8"; + stdout-path = "serial0:115200n8"; }; soc { diff --git a/target/linux/ipq806x/files-4.14/arch/arm/boot/dts/qcom-ipq8064-wg2600hp.dts b/target/linux/ipq806x/files-4.14/arch/arm/boot/dts/qcom-ipq8064-wg2600hp.dts index a6606a0f1d..580e0f86bb 100644 --- a/target/linux/ipq806x/files-4.14/arch/arm/boot/dts/qcom-ipq8064-wg2600hp.dts +++ b/target/linux/ipq806x/files-4.14/arch/arm/boot/dts/qcom-ipq8064-wg2600hp.dts @@ -32,7 +32,7 @@ }; chosen { - linux,stdout-path = "serial0:115200n8"; + stdout-path = "serial0:115200n8"; }; soc { diff --git a/target/linux/ipq806x/files-4.14/arch/arm/boot/dts/qcom-ipq8064-wpq864.dts b/target/linux/ipq806x/files-4.14/arch/arm/boot/dts/qcom-ipq8064-wpq864.dts index 34377e3504..591f3539f5 100644 --- a/target/linux/ipq806x/files-4.14/arch/arm/boot/dts/qcom-ipq8064-wpq864.dts +++ b/target/linux/ipq806x/files-4.14/arch/arm/boot/dts/qcom-ipq8064-wpq864.dts @@ -53,7 +53,7 @@ }; chosen { - linux,stdout-path = "serial0:115200n8"; + stdout-path = "serial0:115200n8"; }; soc { diff --git a/target/linux/ipq806x/files-4.14/arch/arm/boot/dts/qcom-ipq8065-nbg6817.dts b/target/linux/ipq806x/files-4.14/arch/arm/boot/dts/qcom-ipq8065-nbg6817.dts index 35ee40c0a3..dd06fccd1e 100644 --- a/target/linux/ipq806x/files-4.14/arch/arm/boot/dts/qcom-ipq8065-nbg6817.dts +++ b/target/linux/ipq806x/files-4.14/arch/arm/boot/dts/qcom-ipq8065-nbg6817.dts @@ -34,7 +34,7 @@ chosen { bootargs = "rootfstype=squashfs,ext4 rootwait noinitrd"; - linux,stdout-path = "serial0:115200n8"; + stdout-path = "serial0:115200n8"; append-rootblock = "root=/dev/mmcblk0p"; }; diff --git a/target/linux/ipq806x/files-4.14/arch/arm/boot/dts/qcom-ipq8065-r7800.dts b/target/linux/ipq806x/files-4.14/arch/arm/boot/dts/qcom-ipq8065-r7800.dts index 5b741598e3..c4c9287942 100644 --- a/target/linux/ipq806x/files-4.14/arch/arm/boot/dts/qcom-ipq8065-r7800.dts +++ b/target/linux/ipq806x/files-4.14/arch/arm/boot/dts/qcom-ipq8065-r7800.dts @@ -37,7 +37,7 @@ }; chosen { - linux,stdout-path = "serial0:115200n8"; + stdout-path = "serial0:115200n8"; }; soc { diff --git a/target/linux/mpc85xx/files/arch/powerpc/boot/dts/tl-wdr4900-v1.dts b/target/linux/mpc85xx/files/arch/powerpc/boot/dts/tl-wdr4900-v1.dts index bde5eb9575..c54cab9511 100644 --- a/target/linux/mpc85xx/files/arch/powerpc/boot/dts/tl-wdr4900-v1.dts +++ b/target/linux/mpc85xx/files/arch/powerpc/boot/dts/tl-wdr4900-v1.dts @@ -18,7 +18,7 @@ chosen { bootargs = "console=ttyS0,115200"; /* - linux,stdout-path = "/soc@ffe00000/serial@4500"; + stdout-path = "/soc@ffe00000/serial@4500"; */ }; -- 2.30.2