From 8b405e9c6ddab8bbc7c6dcae7d20415bd8f5ad76 Mon Sep 17 00:00:00 2001 From: Govind Singh Date: Tue, 21 Oct 2025 16:00:55 +0400 Subject: [PATCH] chore(fmt): apply nix formatting Signed-off-by: Govind Singh --- nxp/imx93-evk/bsp/imx93-atf.nix | 13 ++++++++++--- nxp/imx93-evk/bsp/imx93-boot.nix | 1 - nxp/imx93-evk/bsp/imx93-firmware.nix | 7 ++++--- nxp/imx93-evk/bsp/imx93-linux.nix | 14 +++++++------- nxp/imx93-evk/bsp/imx93-optee-os.nix | 6 +++--- nxp/imx93-evk/bsp/imx93-uboot.nix | 6 ------ nxp/imx93-evk/default.nix | 4 +++- 7 files changed, 27 insertions(+), 24 deletions(-) diff --git a/nxp/imx93-evk/bsp/imx93-atf.nix b/nxp/imx93-evk/bsp/imx93-atf.nix index 4180dde5..634cca19 100644 --- a/nxp/imx93-evk/bsp/imx93-atf.nix +++ b/nxp/imx93-evk/bsp/imx93-atf.nix @@ -1,8 +1,16 @@ -{ lib, fetchgit, stdenv, buildPackages, pkgsCross, openssl }: +{ + lib, + fetchgit, + stdenv, + buildPackages, + pkgsCross, + openssl, +}: let target-board = "imx93"; -in stdenv.mkDerivation rec { +in +stdenv.mkDerivation rec { pname = "imx93-atf"; version = "2.10.0"; platform = target-board; @@ -47,4 +55,3 @@ in stdenv.mkDerivation rec { platforms = [ "aarch64-linux" ]; }; } - diff --git a/nxp/imx93-evk/bsp/imx93-boot.nix b/nxp/imx93-evk/bsp/imx93-boot.nix index abc023e7..c11f31d5 100644 --- a/nxp/imx93-evk/bsp/imx93-boot.nix +++ b/nxp/imx93-evk/bsp/imx93-boot.nix @@ -3,7 +3,6 @@ }: with pkgs; let - fw-ver = "202406"; imx93-atf = pkgs.callPackage ./imx93-atf.nix { }; imx93-firmware = pkgs.callPackage ./imx93-firmware.nix { }; diff --git a/nxp/imx93-evk/bsp/imx93-firmware.nix b/nxp/imx93-evk/bsp/imx93-firmware.nix index b48e8a36..1caa2392 100644 --- a/nxp/imx93-evk/bsp/imx93-firmware.nix +++ b/nxp/imx93-evk/bsp/imx93-firmware.nix @@ -5,7 +5,6 @@ stdenv.mkDerivation rec { pname = "nxp-firmware"; version = "nxp-firmware-8.21-0.11"; - # Fetch the two firmware installers from NXP ddrFirmware = fetchurl { url = "https://www.nxp.com/lgfiles/NMG/MAD/YOCTO/firmware-imx-8.21.bin"; sha256 = "sha256-w0R/D4E0FczqncLvEggMs6yLvAxnOSp0/H1ZIF61pnI="; @@ -16,7 +15,10 @@ stdenv.mkDerivation rec { sha256 = "sha256-JpSAQXqK6apMxBAauUcof8M0VakxAh29xNm621ISvOs="; }; - nativeBuildInputs = [ coreutils bash ]; + nativeBuildInputs = [ + coreutils + bash + ]; dontUnpack = true; dontStrip = true; @@ -44,4 +46,3 @@ stdenv.mkDerivation rec { ''; } - diff --git a/nxp/imx93-evk/bsp/imx93-linux.nix b/nxp/imx93-evk/bsp/imx93-linux.nix index 1eabbf4e..6e4cc21f 100644 --- a/nxp/imx93-evk/bsp/imx93-linux.nix +++ b/nxp/imx93-evk/bsp/imx93-linux.nix @@ -51,12 +51,12 @@ buildLinux ( rev = "37d02f4dcbbe6677dc9f5fc17f386c05d6a7bd7a"; sha256 = "sha256-1oJMbHR8Ho0zNritEJ+TMOAyYHCW0vwhPkDfLctrZa8="; }; - meta = with lib; { - homepage = "https://github.com/nxp-imx/linux-imx"; - license = [ licenses.gpl2Only ]; - maintainers = with maintainers; [ govindsi ]; - platforms = [ "aarch64-linux" ]; - }; - } + meta = with lib; { + homepage = "https://github.com/nxp-imx/linux-imx"; + license = [ licenses.gpl2Only ]; + maintainers = with maintainers; [ govindsi ]; + platforms = [ "aarch64-linux" ]; + }; + } // (args.argsOverride or { }) ) diff --git a/nxp/imx93-evk/bsp/imx93-optee-os.nix b/nxp/imx93-evk/bsp/imx93-optee-os.nix index a7d82eb3..75e3dde7 100644 --- a/nxp/imx93-evk/bsp/imx93-optee-os.nix +++ b/nxp/imx93-evk/bsp/imx93-optee-os.nix @@ -1,6 +1,6 @@ -{ +{ lib, - pkgs + pkgs, }: let inherit (pkgs.buildPackages) python3; @@ -57,7 +57,7 @@ pkgs.stdenv.mkDerivation rec { --replace "\$(CROSS_COMPILE_\$(sm))ar" ${binutils}/bin/${toolchain.targetPrefix}ar substituteInPlace mk/gcc.mk \ --replace "\$(CROSS_COMPILE_\$(sm))cpp" ${cpp}/bin/cpp - ''; + ''; makeFlags = [ "PLATFORM=imx-mx93evk" diff --git a/nxp/imx93-evk/bsp/imx93-uboot.nix b/nxp/imx93-evk/bsp/imx93-uboot.nix index f0bb6265..ce918381 100644 --- a/nxp/imx93-evk/bsp/imx93-uboot.nix +++ b/nxp/imx93-evk/bsp/imx93-uboot.nix @@ -21,12 +21,6 @@ let rev = "e3219a5a73445219df605d1492687918d488055c"; sha256 = "sha256-6pXwgNzq4/XUUEmJ6sGC5pII4J5uMvlDPE9QJxjJJbQ="; }; - meta = with lib; { - homepage = "https://github.com/nxp-imx/uboot-imx"; - license = [ licenses.gpl2Only ]; - maintainers = with maintainers; [ govindsi ]; - platforms = [ "aarch64-linux" ]; - }; in stdenv.mkDerivation { pname = "imx93-uboot"; diff --git a/nxp/imx93-evk/default.nix b/nxp/imx93-evk/default.nix index 892c6a64..fd375aa4 100644 --- a/nxp/imx93-evk/default.nix +++ b/nxp/imx93-evk/default.nix @@ -9,7 +9,9 @@ ]; boot.loader.grub.extraFiles = { - "imx93-11x11-evk.dtb" = "${pkgs.callPackage ./bsp/imx93-linux.nix { }}/dtbs/freescale/imx93-11x11-evk.dtb"; + "imx93-11x11-evk.dtb" = "${ + pkgs.callPackage ./bsp/imx93-linux.nix { } + }/dtbs/freescale/imx93-11x11-evk.dtb"; }; hardware.deviceTree = {