Skip to content

Commit 0092c67

Browse files
committed
roll back the related trust function to Tinker-OS V2.0.7
The trust function needs to be enabled at uboot and kernel. Before we update the uboot to the latest version, just keep the trust function as the previous version. Change-Id: Ib737aab24cb36dfc63e9772291410c18f0957178 Reviewed-on: https://tp-biosrd-v02/gerrit/83416 Reviewed-by: Jamess Huang(黃以民) <Jamess_Huang@asus.com> Tested-by: Jamess Huang(黃以民) <Jamess_Huang@asus.com>
1 parent 193b14f commit 0092c67

File tree

2 files changed

+42
-2
lines changed

2 files changed

+42
-2
lines changed

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

Lines changed: 42 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
/ {
1010
chosen {
11-
bootargs = "earlyprintk console=tty1 console=ttyS2,115200n8 rw root=PARTUUID=614e0000-0000 rootfstype=ext4 rootwait";
11+
bootargs = "earlyprintk console=ttyFIQ0 rw root=PARTUUID=614e0000-0000 rootfstype=ext4 rootwait";
1212
};
1313

1414
/delete-node/ dmc@ff610000;
@@ -73,4 +73,45 @@
7373
};
7474
};
7575

76+
fiq-debugger {
77+
compatible = "rockchip,fiq-debugger";
78+
interrupts = <GIC_SPI 153 IRQ_TYPE_LEVEL_HIGH>;
79+
rockchip,serial-id = <2>;
80+
rockchip,wake-irq = <0>;
81+
/* If enable uart uses irq instead of fiq */
82+
rockchip,irq-mode-enable = <0>;
83+
rockchip,baudrate = <115200>; /* Only 115200 and 1500000 */
84+
pinctrl-names = "default";
85+
pinctrl-0 = <&uart2_xfer>;
86+
};
87+
88+
psci {
89+
compatible = "arm,psci-1.0";
90+
method = "smc";
91+
};
92+
};
93+
94+
&cpu0 {
95+
enable-method = "psci";
96+
};
97+
98+
&cpu1 {
99+
enable-method = "psci";
100+
};
101+
102+
&cpu2 {
103+
enable-method = "psci";
104+
};
105+
106+
&cpu3 {
107+
enable-method = "psci";
108+
};
109+
110+
&dmac_bus_s {
111+
/* change to non-secure dmac */
112+
reg = <0x0 0xff600000 0x0 0x4000>;
113+
};
114+
115+
&efuse {
116+
compatible = "rockchip,rk3288-secure-efuse";
76117
};

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

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

4746
/ {
4847
compatible = "rockchip,rk3288-miniarm", "rockchip,rk3288";

0 commit comments

Comments
 (0)