kernel: fetch from upstream, apply patch

2024-02-29 10:03:39 +02:00
parent f116af1ff2
commit 86302c7dd2
6 changed files with 36093 additions and 23 deletions
--- a/hacks/orangepi5plus/uboot/default.nix
+++ b/hacks/orangepi5plus/uboot/default.nix
@@ -0,0 +1,56 @@
+{
+  fetchFromGitLab,
+  fetchFromGitHub,
+  buildArmTrustedFirmware,
+  buildUBoot,
+}: let
+  rkbin = fetchFromGitHub {
+    owner = "rockchip-linux";
+    repo = "rkbin";
+    rev = "b4558da0860ca48bf1a571dd33ccba580b9abe23";
+    hash = "sha256-KUZQaQ+IZ0OynawlYGW99QGAOmOrGt2CZidI3NTxFw8=";
+  };
+
+  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 = "2024.01";
+
+    src = fetchFromGitLab {
+      domain = "source.denx.de";
+      owner = "u-boot";
+      repo = "u-boot";
+      rev = "v${version}";
+      hash = "sha256-0Da7Czy9cpQ+D5EICc3/QSZhAdCBsmeMvBgykYhAQFw=";
+    };
+
+    defconfig = "orangepi-5-plus-rk3588_defconfig";
+    extraConfig = ''CONFIG_ROCKCHIP_SPI_IMAGE=y'';
+
+    patches = [];
+
+    ROCKCHIP_TPL = "${rkbin}/bin/rk35/rk3588_ddr_lp4_2112MHz_lp5_2736MHz_v1.12.bin";
+    BL31 = "${tfa}/bl31.elf";
+
+    # FIXME: seems to not like nixpkgs dtc for some reason
+    extraMakeFlags = ["DTC=./scripts/dtc/dtc"];
+
+    filesToInstall = [".config" "u-boot.itb" "idbloader.img" "u-boot-rockchip.bin" "u-boot-rockchip-spi.bin"];
+
+    extraMeta.platforms = ["aarch64-linux"];
+  }
--- a/hacks/orangepi5plus/uboot/sata.patch
+++ b/hacks/orangepi5plus/uboot/sata.patch
@@ -0,0 +1,34 @@
+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>;