Skip to content

Commit 1e9f9ce

Browse files
yueshurkhuangtao
authored andcommitted
arm: dts: rockchip: force the bootargs for rk3288 linux
Force bootargs for bring up rk3288-linux with RKIMG_BOOT. Change-Id: I43d03e51abddeb4c29fb4c94bbd2dba774b4abe5 Signed-off-by: Nickey Yang <nickey.yang@rock-chips.com>
1 parent 5c831a9 commit 1e9f9ce

11 files changed

Lines changed: 21 additions & 5 deletions

arch/arm/boot/dts/rk3288-evb-act8846.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040

4141
/dts-v1/;
4242
#include "rk3288-evb.dtsi"
43-
43+
#include "rk3288-linux.dtsi"
4444
/ {
4545
compatible = "rockchip,rk3288-evb-act8846", "rockchip,rk3288";
4646

arch/arm/boot/dts/rk3288-evb-rk808-linux.dts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040

4141
/dts-v1/;
4242
#include "rk3288-evb.dtsi"
43+
#include "rk3288-linux.dtsi"
4344

4445
/ {
4546
compatible = "rockchip,rk3288-evb-rk808-linux", "rockchip,rk3288";

arch/arm/boot/dts/rk3288-evb.dtsi

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,6 @@
4545
#include "rk3288.dtsi"
4646

4747
/ {
48-
chosen {
49-
bootargs = "earlycon=uart8250,mmio32,0xff690000 swiotlb=1";
50-
};
51-
5248
edp_panel: edp-panel {
5349
status = "disabled";
5450

arch/arm/boot/dts/rk3288-fennec.dts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242

4343
#include <dt-bindings/clock/rockchip,rk808.h>
4444
#include "rk3288.dtsi"
45+
#include "rk3288-linux.dtsi"
4546

4647
/ {
4748
model = "Rockchip RK3288 Fennec Board";

arch/arm/boot/dts/rk3288-firefly-reload-linux.dts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
#include <dt-bindings/display/media-bus-format.h>
1111
#include"rk3288-firefly.dtsi"
1212
#include"rk3288-rkisp1.dtsi"
13+
#include "rk3288-linux.dtsi"
1314

1415
/ {
1516
model = "Firefly-RK3288";

arch/arm/boot/dts/rk3288-firefly.dts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242

4343
/dts-v1/;
4444
#include "rk3288-firefly.dtsi"
45+
#include "rk3288-linux.dtsi"
4546

4647
/ {
4748
model = "Firefly-RK3288";
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
/*
2+
* Copyright (c) 2018 Fuzhou Rockchip Electronics Co., Ltd
3+
*
4+
* SPDX-License-Identifier: (GPL-2.0+ OR MIT).
5+
*/
6+
7+
/ {
8+
chosen {
9+
bootargs = "earlyprintk console=tty1 console=ttyS2,115200n8 rw root=PARTUUID=614e0000-0000 rootfstype=ext4 rootwait";
10+
};
11+
12+
};

arch/arm/boot/dts/rk3288-miniarm.dts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
#include <dt-bindings/clock/rockchip,rk808.h>
4343
#include "rk3288.dtsi"
4444
#include "rk3288-rkisp1.dtsi"
45+
#include "rk3288-linux.dtsi"
4546

4647
/ {
4748
compatible = "rockchip,rk3288-miniarm", "rockchip,rk3288";

arch/arm/boot/dts/rk3288-miqi.dts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
/dts-v1/;
4444
#include <dt-bindings/pwm/pwm.h>
4545
#include "rk3288.dtsi"
46+
#include "rk3288-linux.dtsi"
4647

4748
/ {
4849
compatible = "rockchip,rk3288-miqi", "rockchip,rk3288";

arch/arm/boot/dts/rk3288-phycore-rdk.dts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@
4747
#include <dt-bindings/input/input.h>
4848
#include <dt-bindings/leds/leds-pca9532.h>
4949
#include "rk3288-phycore-som.dtsi"
50+
#include "rk3288-linux.dtsi"
5051

5152
/ {
5253
model = "Phytec RK3288 PCM-947";

0 commit comments

Comments
 (0)