Skip to content

Updating optee's compiling environment #344

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Updating optee's compiling environment #344

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions mk-overlay.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,9 +88,15 @@ makeScope final.newScope (self: {
edk2-jetson uefi-firmware;

inherit (final.callPackages ./pkgs/optee {
# Nvidia's recommended toolchain is gcc9:
# https://nv-tegra.nvidia.com/r/gitweb?p=tegra/optee-src/nv-optee.git;a=blob;f=optee/atf_and_optee_README.txt;h=591edda3d4ec96997e054ebd21fc8326983d3464;hb=5ac2ab218ba9116f1df4a0bb5092b1f6d810e8f7#l33
stdenv = final.gcc9Stdenv;
# As today as this comment is written then nixpkgs unstabble has removed
# gcc12Stdenv and below support. The next "oldest" is gcc13Stdenv.
#
# Jetson 36.x; Anticipating upcomming nixpkgs updates and
# therefore swithching directly to use gcc13Stdenv. Officially NVIDIA
# uses gcc11
#
# Jetson 35.x: Keeping gcc9 as per NVIDIA recommends
stdenv = if self.l4tAtLeast "36" then final.gcc13Stdenv else final.gcc9Stdenv;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

JetPack 5 devices remain broken with this change. I suspect we can upgrade all OP-TEE versions to gcc13.

inherit (self) bspSrc gitRepos l4tMajorMinorPatchVersion l4tAtLeast uefi-firmware;
}) buildTOS buildOpteeTaDevKit opteeClient;
genEkb = self.callPackage ./pkgs/optee/gen-ekb.nix { };
Expand Down