aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/powerpc/boot/dts/holly.dts1
-rw-r--r--arch/powerpc/configs/holly_defconfig3
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/boot/dts/holly.dts b/arch/powerpc/boot/dts/holly.dts
index 254499b107f4..e6b5091de9ce 100644
--- a/arch/powerpc/boot/dts/holly.dts
+++ b/arch/powerpc/boot/dts/holly.dts
@@ -193,6 +193,5 @@
193 193
194 chosen { 194 chosen {
195 linux,stdout-path = "/tsi109@c0000000/serial@7808"; 195 linux,stdout-path = "/tsi109@c0000000/serial@7808";
196 bootargs = "console=ttyS0,115200";
197 }; 196 };
198}; 197};
diff --git a/arch/powerpc/configs/holly_defconfig b/arch/powerpc/configs/holly_defconfig
index be633b9b57c3..8ad57b94eab2 100644
--- a/arch/powerpc/configs/holly_defconfig
+++ b/arch/powerpc/configs/holly_defconfig
@@ -182,7 +182,8 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
182# CONFIG_RESOURCES_64BIT is not set 182# CONFIG_RESOURCES_64BIT is not set
183CONFIG_ZONE_DMA_FLAG=1 183CONFIG_ZONE_DMA_FLAG=1
184CONFIG_PROC_DEVICETREE=y 184CONFIG_PROC_DEVICETREE=y
185# CONFIG_CMDLINE_BOOL is not set 185CONFIG_CMDLINE_BOOL=y
186CONFIG_CMDLINE="console=ttyS0,115200"
186# CONFIG_PM is not set 187# CONFIG_PM is not set
187# CONFIG_SECCOMP is not set 188# CONFIG_SECCOMP is not set
188# CONFIG_WANT_DEVICE_TREE is not set 189# CONFIG_WANT_DEVICE_TREE is not set