aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>2015-03-03 09:41:02 -0500
committerGregory CLEMENT <gregory.clement@free-electrons.com>2015-03-04 09:02:28 -0500
commit9552203cb08b9802e17f19bd5c786d6a2281a04a (patch)
treef08a52f5e713bb70ea77496e0791c7b117975efc
parentbf6acf1657ab906531549d3e8fbe9027d90e4c86 (diff)
ARM: mvebu: use stdout-path in all armada-*.dts
This commit adds the stdout-path property in /chosen for all Armada boards that were not yet carrying this property, and gets rid of /chosen/bootargs which becomes unneeded: earlyprintk should not be used by default, and the console= parameter is replaced by the /chosen/stdout-path property. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
Diffstat
-rw-r--r--arch/arm/boot/dts/armada-370-db.dts2
-rw-r--r--arch/arm/boot/dts/armada-370-mirabox.dts2
-rw-r--r--arch/arm/boot/dts/armada-370-netgear-rn102.dts2
-rw-r--r--arch/arm/boot/dts/armada-370-netgear-rn104.dts2
-rw-r--r--arch/arm/boot/dts/armada-370-rd.dts2
-rw-r--r--arch/arm/boot/dts/armada-370-synology-ds213j.dts3
-rw-r--r--arch/arm/boot/dts/armada-375-db.dts2
-rw-r--r--arch/arm/boot/dts/armada-385-db-ap.dts3
-rw-r--r--arch/arm/boot/dts/armada-388-db.dts2
-rw-r--r--arch/arm/boot/dts/armada-388-gp.dts3
-rw-r--r--arch/arm/boot/dts/armada-388-rd.dts2
-rw-r--r--arch/arm/boot/dts/armada-xp-axpwifiap.dts2
-rw-r--r--arch/arm/boot/dts/armada-xp-db.dts2
-rw-r--r--arch/arm/boot/dts/armada-xp-gp.dts2
-rw-r--r--arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts3
-rw-r--r--arch/arm/boot/dts/armada-xp-matrix.dts2
-rw-r--r--arch/arm/boot/dts/armada-xp-netgear-rn2120.dts2
-rw-r--r--arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts2
-rw-r--r--arch/arm/boot/dts/armada-xp-synology-ds414.dts3
19 files changed, 19 insertions, 24 deletions
diff --git a/arch/arm/boot/dts/armada-370-db.dts b/arch/arm/boot/dts/armada-370-db.dts
index e993c46bd472..485ecf856fae 100644
--- a/arch/arm/boot/dts/armada-370-db.dts
+++ b/arch/arm/boot/dts/armada-370-db.dts
@@ -55,7 +55,7 @@
55 compatible = "marvell,a370-db", "marvell,armada370", "marvell,armada-370-xp"; 55 compatible = "marvell,a370-db", "marvell,armada370", "marvell,armada-370-xp";
56 56
57 chosen { 57 chosen {
58 bootargs = "console=ttyS0,115200 earlyprintk"; 58 stdout-path = "serial0:115200n8";
59 }; 59 };
60 60
61 memory { 61 memory {
diff --git a/arch/arm/boot/dts/armada-370-mirabox.dts b/arch/arm/boot/dts/armada-370-mirabox.dts
index b10ceb488efe..0f40d5da28c3 100644
--- a/arch/arm/boot/dts/armada-370-mirabox.dts
+++ b/arch/arm/boot/dts/armada-370-mirabox.dts
@@ -51,7 +51,7 @@
51 compatible = "globalscale,mirabox", "marvell,armada370", "marvell,armada-370-xp"; 51 compatible = "globalscale,mirabox", "marvell,armada370", "marvell,armada-370-xp";
52 52
53 chosen { 53 chosen {
54 bootargs = "console=ttyS0,115200 earlyprintk"; 54 stdout-path = "serial0:115200n8";
55 }; 55 };
56 56
57 memory { 57 memory {
diff --git a/arch/arm/boot/dts/armada-370-netgear-rn102.dts b/arch/arm/boot/dts/armada-370-netgear-rn102.dts
index 3f8cc3845a5e..a31207860f34 100644
--- a/arch/arm/boot/dts/armada-370-netgear-rn102.dts
+++ b/arch/arm/boot/dts/armada-370-netgear-rn102.dts
@@ -53,7 +53,7 @@
53 compatible = "netgear,readynas-102", "marvell,armada370", "marvell,armada-370-xp"; 53 compatible = "netgear,readynas-102", "marvell,armada370", "marvell,armada-370-xp";
54 54
55 chosen { 55 chosen {
56 bootargs = "console=ttyS0,115200 earlyprintk"; 56 stdout-path = "serial0:115200n8";
57 }; 57 };
58 58
59 memory { 59 memory {
diff --git a/arch/arm/boot/dts/armada-370-netgear-rn104.dts b/arch/arm/boot/dts/armada-370-netgear-rn104.dts
index 99eb8a014ac6..00540f292979 100644
--- a/arch/arm/boot/dts/armada-370-netgear-rn104.dts
+++ b/arch/arm/boot/dts/armada-370-netgear-rn104.dts
@@ -53,7 +53,7 @@
53 compatible = "netgear,readynas-104", "marvell,armada370", "marvell,armada-370-xp"; 53 compatible = "netgear,readynas-104", "marvell,armada370", "marvell,armada-370-xp";
54 54
55 chosen { 55 chosen {
56 bootargs = "console=ttyS0,115200 earlyprintk"; 56 stdout-path = "serial0:115200n8";
57 }; 57 };
58 58
59 memory { 59 memory {
diff --git a/arch/arm/boot/dts/armada-370-rd.dts b/arch/arm/boot/dts/armada-370-rd.dts
index 6ae36a38beb2..19475e68b8e9 100644
--- a/arch/arm/boot/dts/armada-370-rd.dts
+++ b/arch/arm/boot/dts/armada-370-rd.dts
@@ -64,7 +64,7 @@
64 compatible = "marvell,a370-rd", "marvell,armada370", "marvell,armada-370-xp"; 64 compatible = "marvell,a370-rd", "marvell,armada370", "marvell,armada-370-xp";
65 65
66 chosen { 66 chosen {
67 bootargs = "console=ttyS0,115200 earlyprintk"; 67 stdout-path = "serial0:115200n8";
68 }; 68 };
69 69
70 memory { 70 memory {
diff --git a/arch/arm/boot/dts/armada-370-synology-ds213j.dts b/arch/arm/boot/dts/armada-370-synology-ds213j.dts
index 59f74e66963f..b42b767763aa 100644
--- a/arch/arm/boot/dts/armada-370-synology-ds213j.dts
+++ b/arch/arm/boot/dts/armada-370-synology-ds213j.dts
@@ -67,8 +67,7 @@
67 "marvell,armada-370-xp"; 67 "marvell,armada-370-xp";
68 68
69 chosen { 69 chosen {
70 bootargs = "console=ttyS0,115200 earlyprintk"; 70 stdout-path = "serial0:115200n8";
71 stdout-path = &uart0;
72 }; 71 };
73 72
74 memory { 73 memory {
diff --git a/arch/arm/boot/dts/armada-375-db.dts b/arch/arm/boot/dts/armada-375-db.dts
index 0440891425c0..4eabc9c21f8d 100644
--- a/arch/arm/boot/dts/armada-375-db.dts
+++ b/arch/arm/boot/dts/armada-375-db.dts
@@ -55,7 +55,7 @@
55 compatible = "marvell,a375-db", "marvell,armada375"; 55 compatible = "marvell,a375-db", "marvell,armada375";
56 56
57 chosen { 57 chosen {
58 bootargs = "console=ttyS0,115200 earlyprintk"; 58 stdout-path = "serial0:115200n8";
59 }; 59 };
60 60
61 memory { 61 memory {
diff --git a/arch/arm/boot/dts/armada-385-db-ap.dts b/arch/arm/boot/dts/armada-385-db-ap.dts
index 9e33f7d7276b..d6b0f7db9624 100644
--- a/arch/arm/boot/dts/armada-385-db-ap.dts
+++ b/arch/arm/boot/dts/armada-385-db-ap.dts
@@ -49,8 +49,7 @@
49 compatible = "marvell,a385-db-ap", "marvell,armada385", "marvell,armada38x"; 49 compatible = "marvell,a385-db-ap", "marvell,armada385", "marvell,armada38x";
50 50
51 chosen { 51 chosen {
52 bootargs = "console=ttyS0,115200"; 52 stdout-path = "serial1:115200n8";
53 stdout-path = &uart1;
54 }; 53 };
55 54
56 memory { 55 memory {
diff --git a/arch/arm/boot/dts/armada-388-db.dts b/arch/arm/boot/dts/armada-388-db.dts
index af6c74e5e7d6..51d1623de53e 100644
--- a/arch/arm/boot/dts/armada-388-db.dts
+++ b/arch/arm/boot/dts/armada-388-db.dts
@@ -54,7 +54,7 @@
54 "marvell,armada385", "marvell,armada380"; 54 "marvell,armada385", "marvell,armada380";
55 55
56 chosen { 56 chosen {
57 bootargs = "console=ttyS0,115200 earlyprintk"; 57 stdout-path = "serial0:115200n8";
58 }; 58 };
59 59
60 memory { 60 memory {
diff --git a/arch/arm/boot/dts/armada-388-gp.dts b/arch/arm/boot/dts/armada-388-gp.dts
index 3ff05739ac48..78514ab0b47a 100644
--- a/arch/arm/boot/dts/armada-388-gp.dts
+++ b/arch/arm/boot/dts/armada-388-gp.dts
@@ -48,8 +48,7 @@
48 compatible = "marvell,a385-gp", "marvell,armada388", "marvell,armada380"; 48 compatible = "marvell,a385-gp", "marvell,armada388", "marvell,armada380";
49 49
50 chosen { 50 chosen {
51 bootargs = "console=ttyS0,115200"; 51 stdout-path = "serial0:115200n8";
52 stdout-path = &uart0;
53 }; 52 };
54 53
55 memory { 54 memory {
diff --git a/arch/arm/boot/dts/armada-388-rd.dts b/arch/arm/boot/dts/armada-388-rd.dts
index 1ecf511288c9..1dc6e2341cc2 100644
--- a/arch/arm/boot/dts/armada-388-rd.dts
+++ b/arch/arm/boot/dts/armada-388-rd.dts
@@ -55,7 +55,7 @@
55 "marvell,armada385","marvell,armada380"; 55 "marvell,armada385","marvell,armada380";
56 56
57 chosen { 57 chosen {
58 bootargs = "console=ttyS0,115200 earlyprintk"; 58 stdout-path = "serial0:115200n8";
59 }; 59 };
60 60
61 memory { 61 memory {
diff --git a/arch/arm/boot/dts/armada-xp-axpwifiap.dts b/arch/arm/boot/dts/armada-xp-axpwifiap.dts
index c1fbab243609..dfd782b44e50 100644
--- a/arch/arm/boot/dts/armada-xp-axpwifiap.dts
+++ b/arch/arm/boot/dts/armada-xp-axpwifiap.dts
@@ -59,7 +59,7 @@
59 compatible = "marvell,rd-axpwifiap", "marvell,armadaxp-mv78230", "marvell,armadaxp", "marvell,armada-370-xp"; 59 compatible = "marvell,rd-axpwifiap", "marvell,armadaxp-mv78230", "marvell,armadaxp", "marvell,armada-370-xp";
60 60
61 chosen { 61 chosen {
62 bootargs = "console=ttyS0,115200 earlyprintk"; 62 stdout-path = "serial0:115200n8";
63 }; 63 };
64 64
65 memory { 65 memory {
diff --git a/arch/arm/boot/dts/armada-xp-db.dts b/arch/arm/boot/dts/armada-xp-db.dts
index 48bdafe17526..103782407618 100644
--- a/arch/arm/boot/dts/armada-xp-db.dts
+++ b/arch/arm/boot/dts/armada-xp-db.dts
@@ -64,7 +64,7 @@
64 compatible = "marvell,axp-db", "marvell,armadaxp-mv78460", "marvell,armadaxp", "marvell,armada-370-xp"; 64 compatible = "marvell,axp-db", "marvell,armadaxp-mv78460", "marvell,armadaxp", "marvell,armada-370-xp";
65 65
66 chosen { 66 chosen {
67 bootargs = "console=ttyS0,115200 earlyprintk"; 67 stdout-path = "serial0:115200n8";
68 }; 68 };
69 69
70 memory { 70 memory {
diff --git a/arch/arm/boot/dts/armada-xp-gp.dts b/arch/arm/boot/dts/armada-xp-gp.dts
index 206aebba01be..565227eacf06 100644
--- a/arch/arm/boot/dts/armada-xp-gp.dts
+++ b/arch/arm/boot/dts/armada-xp-gp.dts
@@ -65,7 +65,7 @@
65 compatible = "marvell,axp-gp", "marvell,armadaxp-mv78460", "marvell,armadaxp", "marvell,armada-370-xp"; 65 compatible = "marvell,axp-gp", "marvell,armadaxp-mv78460", "marvell,armadaxp", "marvell,armada-370-xp";
66 66
67 chosen { 67 chosen {
68 bootargs = "console=ttyS0,115200 earlyprintk"; 68 stdout-path = "serial0:115200n8";
69 }; 69 };
70 70
71 memory { 71 memory {
diff --git a/arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts b/arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts
index 5fb3c8b687cf..06a6a6c1fdf7 100644
--- a/arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts
+++ b/arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts
@@ -54,8 +54,7 @@
54 "marvell,armadaxp", "marvell,armada-370-xp"; 54 "marvell,armadaxp", "marvell,armada-370-xp";
55 55
56 chosen { 56 chosen {
57 bootargs = "console=ttyS0,115200 earlyprintk"; 57 stdout-path = "serial0:115200n8";
58 stdout-path = &uart0;
59 }; 58 };
60 59
61 memory { 60 memory {
diff --git a/arch/arm/boot/dts/armada-xp-matrix.dts b/arch/arm/boot/dts/armada-xp-matrix.dts
index 56f958eb1ede..f894bc83e957 100644
--- a/arch/arm/boot/dts/armada-xp-matrix.dts
+++ b/arch/arm/boot/dts/armada-xp-matrix.dts
@@ -52,7 +52,7 @@
52 compatible = "marvell,axp-matrix", "marvell,armadaxp-mv78460", "marvell,armadaxp", "marvell,armada-370-xp"; 52 compatible = "marvell,axp-matrix", "marvell,armadaxp-mv78460", "marvell,armadaxp", "marvell,armada-370-xp";
53 53
54 chosen { 54 chosen {
55 bootargs = "console=ttyS0,115200 earlyprintk"; 55 stdout-path = "serial0:115200n8";
56 }; 56 };
57 57
58 memory { 58 memory {
diff --git a/arch/arm/boot/dts/armada-xp-netgear-rn2120.dts b/arch/arm/boot/dts/armada-xp-netgear-rn2120.dts
index 99cb9a8401b4..1516fc2627f9 100644
--- a/arch/arm/boot/dts/armada-xp-netgear-rn2120.dts
+++ b/arch/arm/boot/dts/armada-xp-netgear-rn2120.dts
@@ -53,7 +53,7 @@
53 compatible = "netgear,readynas-2120", "marvell,armadaxp-mv78230", "marvell,armadaxp", "marvell,armada-370-xp"; 53 compatible = "netgear,readynas-2120", "marvell,armadaxp-mv78230", "marvell,armadaxp", "marvell,armada-370-xp";
54 54
55 chosen { 55 chosen {
56 bootargs = "console=ttyS0,115200 earlyprintk"; 56 stdout-path = "serial0:115200n8";
57 }; 57 };
58 58
59 memory { 59 memory {
diff --git a/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts b/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts
index 0c76d9f05fd0..e3b08fb959e5 100644
--- a/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts
+++ b/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts
@@ -54,7 +54,7 @@
54 compatible = "plathome,openblocks-ax3-4", "marvell,armadaxp-mv78260", "marvell,armadaxp", "marvell,armada-370-xp"; 54 compatible = "plathome,openblocks-ax3-4", "marvell,armadaxp-mv78260", "marvell,armadaxp", "marvell,armada-370-xp";
55 55
56 chosen { 56 chosen {
57 bootargs = "console=ttyS0,115200 earlyprintk"; 57 stdout-path = "serial0:115200n8";
58 }; 58 };
59 59
60 memory { 60 memory {
diff --git a/arch/arm/boot/dts/armada-xp-synology-ds414.dts b/arch/arm/boot/dts/armada-xp-synology-ds414.dts
index e9fb225169aa..6063428fa6a0 100644
--- a/arch/arm/boot/dts/armada-xp-synology-ds414.dts
+++ b/arch/arm/boot/dts/armada-xp-synology-ds414.dts
@@ -67,8 +67,7 @@
67 "marvell,armadaxp", "marvell,armada-370-xp"; 67 "marvell,armadaxp", "marvell,armada-370-xp";
68 68
69 chosen { 69 chosen {
70 bootargs = "console=ttyS0,115200 earlyprintk"; 70 stdout-path = "serial0:115200n8";
71 stdout-path = &uart0;
72 }; 71 };
73 72
74 memory { 73 memory {
generated by cgit v1.2.2 (git 2.25.0) at 2025-02-26 09:55:21 -0500