Commit a8939d1a authored by Arnd Bergmann's avatar Arnd Bergmann

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
parents 49eb5926 14317946
......@@ -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 {
......
......@@ -15,7 +15,7 @@ / {
compatible = "hisilicon,hix5hd2";
chosen {
bootargs = "console=ttyAMA0,115200 earlyprintk";
stdout-path = "serial0:115200n8";
};
cpus {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment