arm-bsp/edk2-firmware: fix build on newer hosts

Compiles of edk2-firmware with GCC 15 on the host will fail:

main.c: In function ‘ProcessArgs’:
| main.c:163:42: error: too many arguments to function ‘p->process’; expected 0, have 2
|   163 |                                         (*p->process)( *argv, *(argv+1) );
|       |                                         ~^~~~~~~~~~~~  ~~~~~

We actually already had the fix for this, but were doing SRC_URI +=
_before_ the include file did SRC_URI =, so the patch was never applied.

Move the require to the top of the recipe so this ordering problem does
not happen, and fix the line-endings in the patch that never got applied.

[ YOCTO #16116 ]

Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Jon Mason <jon.mason@arm.com>

meta-arm-bsp/documentation/corstone1000/conf.py

@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: <text>Copyright 2020-2024 Arm Limited and/or its
+# SPDX-FileCopyrightText: <text>Copyright 2020-2024, 2026 Arm Limited and/or its
 # affiliates <open-source-office@arm.com></text>
 #
 # SPDX-License-Identifier: MIT
@@ -26,8 +26,8 @@ sys.path.append(os.path.dirname(__file__))
 
 # -- Project information -----------------------------------------------------
 
-project = 'corstone1000'
-copyright = '2020-2024, Arm Limited'
+project = 'Corstone-1000'
+copyright = '2020-2026, Arm Limited'
 author = 'Arm Limited'
 
 

meta-arm-bsp/documentation/corstone1000/user-guide.rst

@@ -18,17 +18,17 @@ for more information.
 Prerequisites
 -------------
 
-This guide assumes that your host machine is running Ubuntu 20.04 LTS ( with ``sudo`` rights), with at least
+This guide assumes that your host machine is running Ubuntu 24.04 LTS ( with ``sudo`` rights), with at least
 32GB of free disk space and 16GB of RAM as minimum requirement.
 
 The following prerequisites must be available on the host system:
 
-- Git 1.8.3.1 or greater.
-- Python 3.8.0 or greater.
-- GNU Tar 1.28 or greater.
-- GNU Compiler Collection 8.0 or greater.
-- GNU Make 4.0 or greater.
-- tmux.
+- Git 2.39.2 or greater.
+- Python 3.11.2 or greater.
+- GNU Tar 1.34 or greater.
+- GNU Compiler Collection 12.2 or greater.
+- GNU Make 4.3 or greater.
+- tmux 3.3 or greater.
 
 Please follow the steps described in the Yocto mega manual:
 

meta-arm-bsp/recipes-bsp/uefi/edk2-firmware_202408.bb

@@ -1,3 +1,5 @@
+require recipes-bsp/uefi/edk2-firmware.inc
+
 SRCREV_edk2           ?= "b158dad150bf02879668f72ce306445250838201"
 SRCREV_edk2-platforms ?= "a3c898956a4d48dc5980336fa6ce6eeb23c4f72b"
 
@@ -8,5 +10,3 @@ SRC_URI += "file://0001-Platform-StMmRpmb-Fix-build.patch;patchdir=edk2-platform
 # ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type03/MiscChassisManufacturerFunction.c:146:37:
 # error: variable 'ContainedElements' is uninitialized when passed as a const pointer argument here [-Werror,-Wuninitialized-const-pointer]
 TOOLCHAIN:aarch64 = "gcc"
-
-require recipes-bsp/uefi/edk2-firmware.inc

meta-arm-bsp/recipes-bsp/uefi/files/0001-BaseTools-Pccts-set-C-standard.patch

@@ -21,27 +21,27 @@ index 746d58b5e2..b47c8a37af 100644
 --- a/BaseTools/Source/C/VfrCompile/Pccts/antlr/makefile
 +++ b/BaseTools/Source/C/VfrCompile/Pccts/antlr/makefile
 @@ -169,7 +169,7 @@ ANTLR=${BIN_DIR}/antlr
- DLG=${BIN_DIR}/dlg
- OBJ_EXT=o
- OUT_OBJ = -o
--CFLAGS= $(COPT) -I. -I$(SET) -I$(PCCTS_H) -DUSER_ZZSYN $(COTHER) -DZZLEXBUFSIZE=65536
-+CFLAGS= $(COPT) -I. -I$(SET) -I$(PCCTS_H) -DUSER_ZZSYN $(COTHER) -DZZLEXBUFSIZE=65536 -std=gnu11
- CPPFLAGS=
- #
- # SGI Users, use this CFLAGS
+ DLG=${BIN_DIR}/dlg
+ OBJ_EXT=o
+ OUT_OBJ = -o
+-CFLAGS= $(COPT) -I. -I$(SET) -I$(PCCTS_H) -DUSER_ZZSYN $(COTHER) -DZZLEXBUFSIZE=65536
++CFLAGS= $(COPT) -I. -I$(SET) -I$(PCCTS_H) -DUSER_ZZSYN $(COTHER) -DZZLEXBUFSIZE=65536 -std=gnu11
+ CPPFLAGS=
+ #
+ # SGI Users, use this CFLAGS
 diff --git a/BaseTools/Source/C/VfrCompile/Pccts/dlg/makefile b/BaseTools/Source/C/VfrCompile/Pccts/dlg/makefile
 index e45ac98e04..d72bee3d70 100644
 --- a/BaseTools/Source/C/VfrCompile/Pccts/dlg/makefile
 +++ b/BaseTools/Source/C/VfrCompile/Pccts/dlg/makefile
 @@ -123,7 +123,7 @@ endif
- COPT=-O
- ANTLR=${BIN_DIR}/antlr
- DLG=${BIN_DIR}/dlg
--CFLAGS= $(COPT) -I. -I$(SET) -I$(PCCTS_H) -DUSER_ZZSYN -DZZLEXBUFSIZE=65536
-+CFLAGS= $(COPT) -I. -I$(SET) -I$(PCCTS_H) -DUSER_ZZSYN -DZZLEXBUFSIZE=65536 -std=gnu11
- CPPFLAGS=
- OBJ_EXT=o
- OUT_OBJ = -o
+ COPT=-O
+ ANTLR=${BIN_DIR}/antlr
+ DLG=${BIN_DIR}/dlg
+-CFLAGS= $(COPT) -I. -I$(SET) -I$(PCCTS_H) -DUSER_ZZSYN -DZZLEXBUFSIZE=65536
++CFLAGS= $(COPT) -I. -I$(SET) -I$(PCCTS_H) -DUSER_ZZSYN -DZZLEXBUFSIZE=65536 -std=gnu11
+ CPPFLAGS=
+ OBJ_EXT=o
+ OUT_OBJ = -o
 -- 
 2.43.0