瀏覽代碼

Merge tag 'hisi-soc-dt-for-4.4' of git://github.com/hisilicon/linux-hisi into next/dt

Pull "ARM: DT: Hisilicon SoC DT updates for 4.4" from Wei Xu:

- Drop console= and earlyprintk bootargs parameter in hisilicon armv7 dts

* tag 'hisi-soc-dt-for-4.4' of git://github.com/hisilicon/linux-hisi:
  ARM: hisilicon: DT: Drop console= and earlyprintk bootargs parameter
Arnd Bergmann 10 年之前
父節點
當前提交
a8939d1a2f
共有 2 個文件被更改,包括 3 次插入2 次删除
  1. 2 1
      arch/arm/boot/dts/hi3620-hi4511.dts
  2. 1 1
      arch/arm/boot/dts/hisi-x5hd2-dkb.dts

+ 2 - 1
arch/arm/boot/dts/hi3620-hi4511.dts

@@ -16,7 +16,8 @@
 	compatible = "hisilicon,hi3620-hi4511";
 
 	chosen {
-		bootargs = "console=ttyAMA0,115200 root=/dev/ram0 earlyprintk";
+		bootargs = "root=/dev/ram0";
+		stdout-path = "serial0:115200n8";
 	};
 
 	memory {

+ 1 - 1
arch/arm/boot/dts/hisi-x5hd2-dkb.dts

@@ -15,7 +15,7 @@
 	compatible = "hisilicon,hix5hd2";
 
 	chosen {
-		bootargs = "console=ttyAMA0,115200 earlyprintk";
+		stdout-path = "serial0:115200n8";
 	};
 
 	cpus {