Update ATF

pkgs/arm-trusted-firmware-cros/default.nix

@@ -8,13 +8,14 @@ buildArmTrustedFirmware {
   version = "2.10.0";
   src = fetchgit {
     url = "https://chromium.googlesource.com/chromiumos/third_party/arm-trusted-firmware";
-    branchName = "release-R125-15853.B";
-    rev = "17bef2248d4547242463e27cfe48ec96029626b4";
-    hash = "sha256-4Y50B+Xa8fRTa/0R8nm5KQhv1gU9MtAxyh6l5RO5LBM=";
+    branchName = "release-R128-15964.B";
+    rev = "c0d660ac2911453c21d4868e46af714f508f2c19";
+    hash = "sha256-7Ew6zm1pAb608sVBKWGeTnNZ2z07nE/xWcwQrnvW5yU=";
   };
   filesToInstall = [ "build/${platform}/release/bl31/bl31.elf" ];
-  extraMakeFlags = [ "COREBOOT=1" ];
+  extraMakeFlags = [ "DISABLE_BIN_GENERATION=1" "COREBOOT=1" ];
   dontStrip = false;
+  patches = [ ./toolchain.patch ];
   postInstall = ''
     mkdir -p $out/libexec && mv $out/bl31.elf $out/libexec/bl31.elf
   '';

pkgs/arm-trusted-firmware-cros/toolchain.patch

@@ -0,0 +1,68 @@
+diff --git a/make_helpers/build_macros.mk b/make_helpers/build_macros.mk
+index d27408c50..e03a6085b 100644
+--- a/make_helpers/build_macros.mk
++++ b/make_helpers/build_macros.mk
+@@ -307,7 +307,7 @@ $(eval DEP := $(patsubst %.o,%.d,$(OBJ)))
+
+ $(OBJ): $(2) $(filter-out %.d,$(MAKEFILE_LIST)) | lib$(3)_dirs
+ 	$$(s)echo "  AS      $$<"
+-	$$(q)$($(ARCH)-as) -x assembler-with-cpp $$(TF_CFLAGS_$(ARCH)) $$(ASFLAGS) $(MAKE_DEP) -c $$< -o $$@
++	$$(q)$($(ARCH)-cc) -x assembler-with-cpp $$(TF_CFLAGS_$(ARCH)) $$(ASFLAGS) $(MAKE_DEP) -c $$< -o $$@
+
+ -include $(DEP)
+
+@@ -353,7 +353,7 @@ $(eval BL_ASFLAGS := $($(call uppercase,$(3))_ASFLAGS) $(PLAT_BL_COMMON_ASFLAGS)
+
+ $(OBJ): $(2) $(filter-out %.d,$(MAKEFILE_LIST)) | $(3)_dirs
+ 	$$(s)echo "  AS      $$<"
+-	$$(q)$($(ARCH)-as) -x assembler-with-cpp $$(TF_CFLAGS_$(ARCH)) $$(ASFLAGS) $(BL_CPPFLAGS) $(BL_ASFLAGS) $(MAKE_DEP) -c $$< -o $$@
++	$$(q)$($(ARCH)-cc) -x assembler-with-cpp $$(TF_CFLAGS_$(ARCH)) $$(ASFLAGS) $(BL_CPPFLAGS) $(BL_ASFLAGS) $(MAKE_DEP) -c $$< -o $$@
+
+ -include $(DEP)
+
+@@ -564,11 +564,11 @@ endif
+
+ $(DUMP): $(ELF)
+ 	$$(s)echo "  OD      $$@"
+-	$$(q)$($(ARCH)-od) -dx $$< > $$@
++	$$(q)$($(ARCH)-objdump) -dx $$< > $$@
+
+ $(BIN): $(ELF)
+ 	$$(s)echo "  BIN     $$@"
+-	$$(q)$($(ARCH)-oc) -O binary $$< $$@
++	$$(q)$($(ARCH)-objcopy) -O binary $$< $$@
+ 	$(s)echo
+ 	$(s)echo "Built $$@ successfully"
+ 	$(s)echo
+diff --git a/make_helpers/toolchains/aarch64.mk b/make_helpers/toolchains/aarch64.mk
+index 407f06818..dfc4fd32a 100644
+--- a/make_helpers/toolchains/aarch64.mk
++++ b/make_helpers/toolchains/aarch64.mk
+@@ -11,15 +11,15 @@ aarch64-cc-default := $(or $(CROSS_COMPILE),aarch64-none-elf-)gcc
+ aarch64-cc-id-default := gnu-gcc
+
+ aarch64-cpp := $(if $(filter-out default,$(origin CPP)),$(CPP))
+-aarch64-cpp-default := $(or $(CROSS_COMPILE),aarch64-none-elf-)gcc
++aarch64-cpp-default := $(or $(CROSS_COMPILE),aarch64-none-elf-)g++
+ aarch64-cpp-id-default := gnu-gcc
+
+ aarch64-as := $(if $(filter-out default,$(origin AS)),$(AS))
+-aarch64-as-default := $(or $(CROSS_COMPILE),aarch64-none-elf-)gcc
++aarch64-as-default := $(or $(CROSS_COMPILE),aarch64-none-elf-)as
+ aarch64-as-id-default := gnu-gcc
+
+ aarch64-ld := $(if $(filter-out default,$(origin LD)),$(LD))
+-aarch64-ld-default := $(or $(CROSS_COMPILE),aarch64-none-elf-)gcc
++aarch64-ld-default := $(or $(CROSS_COMPILE),aarch64-none-elf-)ld
+ aarch64-ld-id-default := gnu-gcc
+
+ aarch64-oc := $(if $(filter-out default,$(origin OC)),$(OC))
+@@ -31,7 +31,7 @@ aarch64-od-default := $(or $(CROSS_COMPILE),aarch64-none-elf-)objdump
+ aarch64-od-id-default := gnu-objdump
+
+ aarch64-ar := $(if $(filter-out default,$(origin AR)),$(AR))
+-aarch64-ar-default := $(or $(CROSS_COMPILE),aarch64-none-elf-)gcc-ar
++aarch64-ar-default := $(or $(CROSS_COMPILE),aarch64-none-elf-)ar
+ aarch64-ar-id-default := gnu-ar
+
+ aarch64-dtc := $(if $(filter-out default,$(origin DTC)),$(DTC))