diff options
| -rw-r--r-- | flake.lock | 12 | ||||
| -rw-r--r-- | nixos/modules/develop.nix | 2 | ||||
| -rw-r--r-- | pkgs/default.nix | 14 | ||||
| -rw-r--r-- | pkgs/mtk-arm-trusted-firmware/default.nix | 6 |
4 files changed, 18 insertions, 16 deletions
@@ -174,11 +174,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1756750488, - "narHash": "sha256-e4ZAu2sjOtGpvbdS5zo+Va5FUUkAnizl4wb0/JlIL2I=", + "lastModified": 1757103352, + "narHash": "sha256-PtT7ix43ss8PONJ1VJw3f6t2yAoGH+q462Sn8lrmWmk=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "47eb4856cfd01eaeaa7bb5944a0f27db8fb9b94a", + "rev": "11b2a10c7be726321bb854403fdeec391e798bf0", "type": "github" }, "original": { @@ -279,11 +279,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1756787288, - "narHash": "sha256-rw/PHa1cqiePdBxhF66V7R+WAP8WekQ0mCDG4CFqT8Y=", + "lastModified": 1757068644, + "narHash": "sha256-NOrUtIhTkIIumj1E/Rsv1J37Yi3xGStISEo8tZm3KW4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d0fc30899600b9b3466ddb260fd83deb486c32f1", + "rev": "8eb28adfa3dc4de28e792e3bf49fcf9007ca8ac9", "type": "github" }, "original": { diff --git a/nixos/modules/develop.nix b/nixos/modules/develop.nix index fd7bdbf..8e24707 100644 --- a/nixos/modules/develop.nix +++ b/nixos/modules/develop.nix @@ -29,7 +29,7 @@ in { cloc openssl tio - #vim-vint + vim-vint nodePackages.vim-language-server vale diff --git a/pkgs/default.nix b/pkgs/default.nix index b16e3ee..10bb325 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -24,18 +24,20 @@ final: prev: { # OpenWrt One armTrustedFirmwareMT7981 = final.callPackage ./mtk-arm-trusted-firmware rec { - extraMakeFlags = ["BOOT_DEVICE=spim-nand" "DRAM_USE_DDR4=1" "bl2" "bl31"]; + extraMakeFlags = [ + "BOOT_DEVICE=spim-nand" + "DRAM_USE_DDR4=1" + "UBI=1" + "OVERRIDE_UBI_START_ADDR=0x100000" + "bl2" + "bl31" + ]; platform = "mt7981"; extraMeta.platforms = ["aarch64-linux"]; filesToInstall = ["build/${platform}/release/bl2.bin" "build/${platform}/release/bl31.bin"]; }; ubootOpenWrtOne = (final.buildUBoot { - version = "2025.04"; - src = final.fetchurl { - url = "https://ftp.denx.de/pub/u-boot/u-boot-2025.04.tar.bz2"; - hash = "sha256-Q5077ylu/9VBML5qcxxbEYvn/d1/zGY8y8X7GClNhxg="; - }; defconfig = "mt7981_openwrt-one-spi-nand_defconfig"; extraMeta.platforms = ["aarch64-linux"]; BL31 = "${final.armTrustedFirmwareMT7981}/bl31.elf"; diff --git a/pkgs/mtk-arm-trusted-firmware/default.nix b/pkgs/mtk-arm-trusted-firmware/default.nix index 44fbf64..3c0ba33 100644 --- a/pkgs/mtk-arm-trusted-firmware/default.nix +++ b/pkgs/mtk-arm-trusted-firmware/default.nix @@ -12,13 +12,13 @@ }: stdenv.mkDerivation { pname = "arm-trusted-firmware${lib.optionalString (platform != null) "-${platform}"}"; - version = "2025.02.12"; + version = "2025.07.11"; src = fetchFromGitHub { owner = "mtk-openwrt"; repo = "arm-trusted-firmware"; - rev = "e090770684e775711a624e68e0b28112227a4c38"; - hash = "sha256-VI5OB2nWdXUjkSuUXl/0yQN+/aJp9Jkt+hy7DlL+PMg="; + rev = "78a0dfd927bb00ce973a1f8eb4079df0f755887a"; + hash = "sha256-m9ApkBVf0I11rNg68vxofGRJ+BcnlM6C+Zrn8TfMvbY="; }; depsBuildBuild = [buildPackages.stdenv.cc]; |