chore: format repo using treefmt-nix and nixfmt-rfc-style

This commit is contained in:
Andre
2025-06-04 12:11:03 -04:00
parent fc7c471412
commit 51e51e6014
266 changed files with 3721 additions and 2733 deletions

View File

@@ -1,7 +1,7 @@
{
buildArmTrustedFirmware ,
targetBoard ,
fetchgit ,
buildArmTrustedFirmware,
targetBoard,
fetchgit,
}:
{
@@ -15,8 +15,11 @@
platform = targetBoard;
enableParallelBuilding = true;
# To build with tee.bin use extraMakeFlags = [ "bl31 SPD=opteed" ];
extraMakeFlags = [ "PIE_LDFLAGS=--no-warn-rwx-segments LDFLAGS=--no-warn-rwx-segments" "bl31" ];
extraMeta.platforms = ["aarch64-linux"];
filesToInstall = ["build/${targetBoard}/release/bl31.bin"];
extraMakeFlags = [
"PIE_LDFLAGS=--no-warn-rwx-segments LDFLAGS=--no-warn-rwx-segments"
"bl31"
];
extraMeta.platforms = [ "aarch64-linux" ];
filesToInstall = [ "build/${targetBoard}/release/bl31.bin" ];
};
}

View File

@@ -1,5 +1,5 @@
{
pkgs ,
pkgs,
targetBoard,
}:
@@ -47,15 +47,21 @@ pkgs.stdenv.mkDerivation rec {
${firmwareSeco} --auto-accept --force
'';
filesToInstall = [
"firmware-imx-${fwHdmiVersion}/firmware/hdmi/cadence/dpfw.bin"
"firmware-imx-${fwHdmiVersion}/firmware/hdmi/cadence/hdmi?xfw.bin"
] ++ pkgs.lib.optional ( targetBoard == "imx8qm" )
("imx-sc-firmware-${fwScVersion}/mx8qm-mek-scfw-tcm.bin" + " " +
"imx-seco-${fwSecoVersion}/firmware/seco/mx8qmb0-ahab-container.img")
++ pkgs.lib.optional ( targetBoard == "imx8qxp" )
("imx-sc-firmware-${fwScVersion}/mx8qx-mek-scfw-tcm.bin" + " " +
"imx-seco-${fwSecoVersion}/firmware/seco/mx8qxc0-ahab-container.img");
filesToInstall =
[
"firmware-imx-${fwHdmiVersion}/firmware/hdmi/cadence/dpfw.bin"
"firmware-imx-${fwHdmiVersion}/firmware/hdmi/cadence/hdmi?xfw.bin"
]
++ pkgs.lib.optional (targetBoard == "imx8qm") (
"imx-sc-firmware-${fwScVersion}/mx8qm-mek-scfw-tcm.bin"
+ " "
+ "imx-seco-${fwSecoVersion}/firmware/seco/mx8qmb0-ahab-container.img"
)
++ pkgs.lib.optional (targetBoard == "imx8qxp") (
"imx-sc-firmware-${fwScVersion}/mx8qx-mek-scfw-tcm.bin"
+ " "
+ "imx-seco-${fwSecoVersion}/firmware/seco/mx8qxc0-ahab-container.img"
);
installPhase = ''
mkdir -p $out

View File

@@ -5,9 +5,9 @@
let
pkgsCross = import <nixpkgs> {
crossSystem = {
config = "aarch64-unknown-linux-gnu";
};
crossSystem = {
config = "aarch64-unknown-linux-gnu";
};
};
outdir = "out/arm-plat-imx/core";
@@ -18,7 +18,7 @@ let
in
pkgs.stdenv.mkDerivation rec {
pname = "imx-optee-os";
version = "5.15.32_2.0.0";

View File

@@ -1,8 +1,10 @@
{ pkgs ,
{
pkgs,
targetBoard,
}:
with pkgs; let
with pkgs;
let
inherit buildUBoot;
imx8qxp-attrs = {
@@ -21,14 +23,25 @@ with pkgs; let
patches = [ ../patches/0001-Add-UEFI-boot-for-imx8qm.patch ];
};
imx8-attrs = if (targetBoard == "imx8qxp") then imx8qxp-attrs
else if (targetBoard == "imx8qm") then imx8qm-attrs
else {};
imx8-attrs =
if (targetBoard == "imx8qxp") then
imx8qxp-attrs
else if (targetBoard == "imx8qm") then
imx8qm-attrs
else
{ };
inherit (callPackage ./imx-atf.nix { inherit buildArmTrustedFirmware; targetBoard = imx8-attrs.atf; }) armTrustedFirmwareiMX8;
inherit
(callPackage ./imx-atf.nix {
inherit buildArmTrustedFirmware;
targetBoard = imx8-attrs.atf;
})
armTrustedFirmwareiMX8
;
imx-firmware = callPackage ./imx-firmware.nix { inherit pkgs targetBoard; };
imx-mkimage = buildPackages.callPackage ./imx-mkimage.nix { inherit pkgs; };
in {
in
{
ubootImx8 = buildUBoot {
version = "2022.04";
src = fetchgit {
@@ -41,7 +54,7 @@ in {
patches = imx8-attrs.patches;
enableParallelBuilding = true;
defconfig = "${targetBoard}_mek_defconfig";
extraMeta.platforms = ["aarch64-linux"];
extraMeta.platforms = [ "aarch64-linux" ];
preBuildPhases = [ "copyBinaries" ];
copyBinaries = ''
@@ -54,10 +67,9 @@ in {
cat u-boot.bin head.hash > u-boot-hash.bin
dd if=u-boot-hash.bin of=u-boot-atf.bin bs=1K seek=128
${imx-mkimage} -soc ${imx8-attrs.soc} -rev B0 -append ahab-container.img -c -scfw ${imx8-attrs.scfw} -ap u-boot-atf.bin a35 0x80000000 -out flash.bin
'';
'';
filesToInstall = [ "flash.bin" ];
};
inherit imx-firmware;
}