uboot: removeuse bl31 from tfa
Otherwise `cryptsetup benchmark` performance drops to <100MB/s with aes-xts 256b. Now we're almost 400MB/s.
This commit is contained in:
parent
234e7d8979
commit
1038e5ea81
@ -1,7 +1,6 @@
|
|||||||
{
|
{
|
||||||
fetchFromGitLab,
|
fetchFromGitLab,
|
||||||
fetchFromGitHub,
|
fetchFromGitHub,
|
||||||
#buildArmTrustedFirmware,
|
|
||||||
buildUBoot,
|
buildUBoot,
|
||||||
}: let
|
}: let
|
||||||
rkbin = fetchFromGitHub {
|
rkbin = fetchFromGitHub {
|
||||||
@ -10,22 +9,6 @@
|
|||||||
rev = "a2a0b89b6c8c612dca5ed9ed8a68db8a07f68bc0";
|
rev = "a2a0b89b6c8c612dca5ed9ed8a68db8a07f68bc0";
|
||||||
hash = "sha256-U/jeUsV7bhqMw3BljmO6SI07NCDAd/+sEp3dZnyXeeA=";
|
hash = "sha256-U/jeUsV7bhqMw3BljmO6SI07NCDAd/+sEp3dZnyXeeA=";
|
||||||
};
|
};
|
||||||
#tfa =
|
|
||||||
# (buildArmTrustedFirmware rec {
|
|
||||||
# extraMakeFlags = ["bl31"];
|
|
||||||
# platform = "rk3588";
|
|
||||||
# extraMeta.platforms = ["aarch64-linux"];
|
|
||||||
# filesToInstall = ["build/${platform}/release/bl31/bl31.elf"];
|
|
||||||
# })
|
|
||||||
# .overrideAttrs (_: {
|
|
||||||
# src = fetchFromGitLab {
|
|
||||||
# domain = "gitlab.collabora.com";
|
|
||||||
# owner = "hardware-enablement";
|
|
||||||
# repo = "rockchip-3588/trusted-firmware-a";
|
|
||||||
# rev = "002d8e85ce5f4f06ebc2c2c52b4923a514bfa701";
|
|
||||||
# hash = "sha256-1XOG7ILIgWa3uXUmAh9WTfSGLD/76OsmWrUhIxm/zTg=";
|
|
||||||
# };
|
|
||||||
# });
|
|
||||||
in
|
in
|
||||||
buildUBoot rec {
|
buildUBoot rec {
|
||||||
version = "v2024.04-rc3-52-g773cb2bca7";
|
version = "v2024.04-rc3-52-g773cb2bca7";
|
||||||
|
@ -1,34 +0,0 @@
|
|||||||
diff --git a/arch/arm/dts/rk3588s-orangepi-5.dts b/arch/arm/dts/rk3588s-orangepi-5.dts
|
|
||||||
index 8f399c4317..3997984e42 100644
|
|
||||||
--- a/arch/arm/dts/rk3588s-orangepi-5.dts
|
|
||||||
+++ b/arch/arm/dts/rk3588s-orangepi-5.dts
|
|
||||||
@@ -238,7 +238,7 @@
|
|
||||||
&pcie2x1l2 {
|
|
||||||
reset-gpios = <&gpio3 RK_PD1 GPIO_ACTIVE_HIGH>;
|
|
||||||
vpcie3v3-supply = <&vcc3v3_pcie20>;
|
|
||||||
- status = "okay";
|
|
||||||
+ status = "disabled";
|
|
||||||
};
|
|
||||||
|
|
||||||
&pinctrl {
|
|
||||||
@@ -660,3 +660,7 @@
|
|
||||||
&usb_host1_ohci {
|
|
||||||
status = "okay";
|
|
||||||
};
|
|
||||||
+
|
|
||||||
+&sata0 {
|
|
||||||
+ status = "okay";
|
|
||||||
+};
|
|
||||||
diff --git a/arch/arm/dts/rk3588s.dtsi b/arch/arm/dts/rk3588s.dtsi
|
|
||||||
index 61a9a11c3b..05028012ce 100644
|
|
||||||
--- a/arch/arm/dts/rk3588s.dtsi
|
|
||||||
+++ b/arch/arm/dts/rk3588s.dtsi
|
|
||||||
@@ -1390,6 +1390,8 @@
|
|
||||||
#address-cells = <1>;
|
|
||||||
#size-cells = <0>;
|
|
||||||
status = "disabled";
|
|
||||||
+ phys = <&combphy0_ps PHY_TYPE_SATA>;
|
|
||||||
+ phy-names = "sata-phy";
|
|
||||||
|
|
||||||
sata-port@0 {
|
|
||||||
reg = <0>;
|
|
Loading…
Reference in New Issue
Block a user