diff options
| author | Ahmad Fatoum <a.fatoum@pengutronix.de> | 2020-12-03 21:34:44 +0100 |
|---|---|---|
| committer | Robert Schwebel <r.schwebel@pengutronix.de> | 2021-03-15 09:42:08 +0100 |
| commit | 4dc391826b3f2dd5fa19239fd2ceb9a3f8a80965 (patch) | |
| tree | 0ed2851bb0811bfba27f43766e4515f92702028d /configs/platform-v7a/patches/tf-a-v2.4/0101-fdts-stm32mp1-enable-hash1-unconditionally.patch | |
| parent | 075e3668fa512f88e92dd04d721980ceb28a2b1a (diff) | |
| download | DistroKit-4dc391826b3f2dd5fa19239fd2ceb9a3f8a80965.tar.gz DistroKit-4dc391826b3f2dd5fa19239fd2ceb9a3f8a80965.tar.xz | |
v7a: tf-a: update to v2.4
Trusted Firmware-A v2.4 was released last month and adds amongst others,
enhancements to make use of the trusted boot chain possible with
upstream components.
The patch stack has now been posted upstream in hope we can eventually
drop it:
https://review.trustedfirmware.org/c/TF-A/trusted-firmware-a/+/7339
https://review.trustedfirmware.org/c/TF-A/trusted-firmware-a/+/7340
For now, it was rebased with following modifications:
- Sync with upstream device tree and new TF-A requirements
- CLK_ETH_PLL4P is enabled for possible PTP use
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
Diffstat (limited to 'configs/platform-v7a/patches/tf-a-v2.4/0101-fdts-stm32mp1-enable-hash1-unconditionally.patch')
| -rw-r--r-- | configs/platform-v7a/patches/tf-a-v2.4/0101-fdts-stm32mp1-enable-hash1-unconditionally.patch | 63 |
1 files changed, 63 insertions, 0 deletions
diff --git a/configs/platform-v7a/patches/tf-a-v2.4/0101-fdts-stm32mp1-enable-hash1-unconditionally.patch b/configs/platform-v7a/patches/tf-a-v2.4/0101-fdts-stm32mp1-enable-hash1-unconditionally.patch new file mode 100644 index 0000000..c05c02c --- /dev/null +++ b/configs/platform-v7a/patches/tf-a-v2.4/0101-fdts-stm32mp1-enable-hash1-unconditionally.patch @@ -0,0 +1,63 @@ +From: Ahmad Fatoum <a.fatoum@pengutronix.de> +Date: Thu, 3 Dec 2020 20:24:53 +0100 +Subject: [PATCH] fdts: stm32mp1: enable hash1 unconditionally + +&hash1 is an internal IP that can be enabled always as it has no +dependencies. Indeed we must enable it, because TF-A panics otherwise +during stm32mp_init_auth(). Instead of duplicating the enabling +line in every board device tree, stick it into the SoC dtsi. + +This likely fixes boot on the Avenger board that lacks the status = +"okay" line for the &hash1 device tree node. + +Change-Id: I5901029f29af0cf213510878b5daaf5240f96f17 +Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de> +--- + fdts/stm32mp151.dtsi | 2 +- + fdts/stm32mp157c-ed1.dts | 4 ---- + fdts/stm32mp15xx-dkx.dtsi | 4 ---- + 3 files changed, 1 insertion(+), 9 deletions(-) + +diff --git a/fdts/stm32mp151.dtsi b/fdts/stm32mp151.dtsi +index 8f175a6492a1..d908b710bbb9 100644 +--- a/fdts/stm32mp151.dtsi ++++ b/fdts/stm32mp151.dtsi +@@ -253,7 +253,7 @@ + interrupts = <GIC_SPI 80 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&rcc HASH1>; + resets = <&rcc HASH1_R>; +- status = "disabled"; ++ status = "okay"; + }; + + rng1: rng@54003000 { +diff --git a/fdts/stm32mp157c-ed1.dts b/fdts/stm32mp157c-ed1.dts +index a6b98b7d9337..615e2cc07578 100644 +--- a/fdts/stm32mp157c-ed1.dts ++++ b/fdts/stm32mp157c-ed1.dts +@@ -55,10 +55,6 @@ + status="okay"; + }; + +-&hash1 { +- status = "okay"; +-}; +- + &i2c4 { + pinctrl-names = "default"; + pinctrl-0 = <&i2c4_pins_a>; +diff --git a/fdts/stm32mp15xx-dkx.dtsi b/fdts/stm32mp15xx-dkx.dtsi +index 52b914b84e45..e59a65fb5555 100644 +--- a/fdts/stm32mp15xx-dkx.dtsi ++++ b/fdts/stm32mp15xx-dkx.dtsi +@@ -41,10 +41,6 @@ + cpu-supply = <&vddcore>; + }; + +-&hash1 { +- status = "okay"; +-}; +- + &i2c4 { + pinctrl-names = "default"; + pinctrl-0 = <&i2c4_pins_a>; |