diff --git a/boards/pine64-rock64/default.nix b/boards/pine64-rock64/default.nix index eeee3198..159fc918 100644 --- a/boards/pine64-rock64/default.nix +++ b/boards/pine64-rock64/default.nix @@ -1,4 +1,4 @@ -{ +{ pkgs, ...}: { device = { manufacturer = "PINE64"; name = "ROCK64"; @@ -13,7 +13,11 @@ Tow-Boot = { defconfig = "rock64-rk3328_defconfig"; - uBootVersion = "2024.10"; buildUBoot = true; + uBootVersion = "2025.01"; + src = (pkgs.fetchurl { + url = "https://ftp.denx.de/pub/u-boot/u-boot-2025.04-rc2.tar.bz2"; + sha256 = "e54102f17328397d5d63b00865e9108d5806d18018509fc24ce6e7e3fe6a12f1"; + }); }; } diff --git a/modules/hardware/rockchip/default.nix b/modules/hardware/rockchip/default.nix index feb79260..323864b8 100644 --- a/modules/hardware/rockchip/default.nix +++ b/modules/hardware/rockchip/default.nix @@ -145,7 +145,7 @@ in DISPLAY = yes; VIDEO_ROCKCHIP = yes; DISPLAY_ROCKCHIP_HDMI = yes; - PHY_ROCKCHIP_INNO_HDMI = yes; + #PHY_ROCKCHIP_INNO_HDMI = yes; BOOTSTD = lib.mkForce yes; BOOTSTD_DEFAULTS = lib.mkForce yes; DISTRO_DEFAULTS = lib.mkForce no; @@ -172,6 +172,10 @@ in (mkIf cfg.rockchip-rk3328.enable { Tow-Boot.builder.additionalArguments.BL31 = "${pkgs.Tow-Boot.armTrustedFirmwareRK3328}/bl31.elf"; + Tow-Boot.builder.postPatch = '' + substituteInPlace arch/arm/dts/rk3328-rock64-u-boot.dtsi \ + --replace rk3328-sdram-lpddr3-1600.dtsi rk3328-sdram-lpddr3-666.dtsi + ''; }) (mkIf cfg.rockchip-rk3399.enable {