GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-18 13:11:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

dts: ARM: stm32mp15: add OP-TEE node in u-boot DTSI

Browse source 
Add OP-TEE firmware node in stm32mp15 U-Boot DTSI. This node is
needed since commit [1] that changed U-Boot/stm32mp15 to detect
OP-TEE availability by probing the resource instead of relying on
U-Boot configuration. The software sequence implemented by [1] is
fine but U-Boot DTS/DTSI files were not updated accordingly since,
hence OP-TEE presence is never detected by U-Boot, preventing Linux
kernel from using OP-TEE resources.

For consistency and to synchronize stm32mp15 DTSI files (excluding
U-Boot specific DTSI files) with the Linux kernel ones, this change
also moves the OP-TEE reserved memory nodes from board generic DTSI
files to U-Boot specific board DTSI files.

Link: [1] commit 43df0a159d ("stm32mp1: dynamically detect op-tee presence")
Signed-off-by: Etienne Carriere <etienne.carriere@linaro.org>
Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com>
Reviewed-by: Patrice Chotard <patrice.chotard@st.com>
This commit is contained in:
Etienne Carriere 2020-06-05 09:24:30 +02:00 • committed by Patrick Delaunay
parent 164873a0c0
commit 9e69696506
4 changed files with 29 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
arch/arm/dts/stm32mp157a-dk1-u-boot.dtsi
View file

@ -20,6 +20,21 @@
st,fastboot-gpios = <&gpioa 13 GPIO_ACTIVE_LOW>;
st,stm32prog-gpios = <&gpioa 14 GPIO_ACTIVE_LOW>;
};
firmware {
optee {
compatible = "linaro,optee-tz";
method = "smc";
};
};
reserved-memory {
optee@de000000 {
reg = <0xde000000 0x02000000>;
no-map;
};
};
led {
red {
label = "error";

14
arch/arm/dts/stm32mp157c-ed1-u-boot.dtsi
View file

@ -21,6 +21,20 @@
st,stm32prog-gpios = <&gpioa 14 GPIO_ACTIVE_LOW>;
};
firmware {
optee {
compatible = "linaro,optee-tz";
method = "smc";
};
};
reserved-memory {
optee@fe000000 {
reg = <0xfe000000 0x02000000>;
no-map;
};
};
led {
red {
label = "error";

5
arch/arm/dts/stm32mp157c-ed1.dts
View file

@ -70,11 +70,6 @@
reg = <0xe8000000 0x8000000>;
no-map;
};
optee@fe000000 {
reg = <0xfe000000 0x02000000>;
no-map;
};
};
aliases {

5
arch/arm/dts/stm32mp15xx-dkx.dtsi
View file

@ -58,11 +58,6 @@
reg = <0xd4000000 0x4000000>;
no-map;
};
optee@de000000 {
reg = <0xde000000 0x02000000>;
no-map;
};
};
led {