diff --git a/hacks/orangepi5plus/uboot/default.nix b/hacks/orangepi5plus/uboot/default.nix
index 6f9554e..b432ff9 100644
--- a/hacks/orangepi5plus/uboot/default.nix
+++ b/hacks/orangepi5plus/uboot/default.nix
@@ -1,7 +1,6 @@
 {
   fetchFromGitLab,
   fetchFromGitHub,
-  #buildArmTrustedFirmware,
   buildUBoot,
 }: let
   rkbin = fetchFromGitHub {
@@ -10,22 +9,6 @@
     rev = "a2a0b89b6c8c612dca5ed9ed8a68db8a07f68bc0";
     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
   buildUBoot rec {
     version = "v2024.04-rc3-52-g773cb2bca7";
diff --git a/hacks/orangepi5plus/uboot/sata.patch b/hacks/orangepi5plus/uboot/sata.patch
deleted file mode 100644
index 160096b..0000000
--- a/hacks/orangepi5plus/uboot/sata.patch
+++ /dev/null
@@ -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>;