NB: CLANG_35/38 are now replaced with CLANGDWARF.
Patches for brotli enc/dec are no longer required as they were merged upstream.
Signed-off-by: Pawel Zalewski pzalewski@thegoodpenguin.co.uk --- ...lo-2.4.bb => edk2-firmware_morello-2.7.bb} | 23 ++++------ ...Basetools-remove-brotli-build-errors.patch | 45 ------------------- 2 files changed, 9 insertions(+), 59 deletions(-) rename meta-morello/recipes-bsp/uefi/{edk2-firmware_morello-2.4.bb => edk2-firmware_morello-2.7.bb} (67%) delete mode 100644 meta-morello/recipes-bsp/uefi/files/0001-Basetools-remove-brotli-build-errors.patch
diff --git a/meta-morello/recipes-bsp/uefi/edk2-firmware_morello-2.4.bb b/meta-morello/recipes-bsp/uefi/edk2-firmware_morello-2.7.bb similarity index 67% rename from meta-morello/recipes-bsp/uefi/edk2-firmware_morello-2.4.bb rename to meta-morello/recipes-bsp/uefi/edk2-firmware_morello-2.7.bb index 3f421b6..1555e2d 100644 --- a/meta-morello/recipes-bsp/uefi/edk2-firmware_morello-2.4.bb +++ b/meta-morello/recipes-bsp/uefi/edk2-firmware_morello-2.7.bb @@ -21,29 +21,24 @@ SRC_URI = "\ ${EDK2_SRC_URI};name=edk2;destsuffix=edk2 \ ${EDK2_PLATFORMS_SRC_URI};name=edk2-platforms;destsuffix=edk2/edk2-platforms \ ${EDK2_NON_OSI_SRC_URI};name=edk2-non-osi;destsuffix=edk2-non-osi \ - file://files/0001-Basetools-remove-brotli-build-errors.patch \ "
-EDK2_SRC_URI = "gitsm://git.morello-project.org/morello/edk2;branch=morello/release-1.6;protocol=https" -EDK2_PLATFORMS_SRC_URI = "gitsm://git.morello-project.org/morello/edk2-platforms;branch=morello/release-1.6;protocol=https" +EDK2_SRC_URI = "gitsm://git.morello-project.org/morello/edk2;branch=morello/release-1.7;protocol=https" +EDK2_PLATFORMS_SRC_URI = "gitsm://git.morello-project.org/morello/edk2-platforms;branch=morello/release-1.7;protocol=https" EDK2_NON_OSI_SRC_URI = "git://github.com/tianocore/edk2-non-osi;branch=master;protocol=https" SRCREV_edk2-non-osi = "0320db977fb27e63424b0953a3020bb81c89e8f0" -SRCREV_edk2 = "ce510c33dfc354e262ccd71619add069876d6a08" -SRCREV_edk2-platforms = "a5e30111ce700fbd71415bc3b22bbe2561fe5c58" +SRCREV_edk2 = "3bf9a278b7d3ffdde0a40a039a9157f02989e6ba" +SRCREV_edk2-platforms = "dc71a37b1bf6c0ffb3eb1d35dd2dcfb07fba5648"
EDK2_BUILD_RELEASE = "0"
EDK2_BIN_NAME = "BL33_AP_UEFI.fd" EDK2_ARCH = "AARCH64" -EDK2_BUILD_FLAGS += "-D ENABLE_MORELLO_CAP=1" -EDK_COMPILER = "CLANG35" - -export CLANG35_AARCH64_PREFIX = "${TARGET_PREFIX}" -export CLANG35_BIN = "${LLVM_PATH}/" -export CLANG35_AARCH64_PREFIX = "${LLVM_PATH}/llvm-" -export PACKAGES_PATH = "${S}:${S}/edk2-platforms:${WORKDIR}/edk2-non-osi" -export CC_PATH = "${LLVM_PATH}/clang" -export LLVM_PATH_35 = "${LLVM_PATH}" +EDK2_EXTRA_BUILD += "-D ENABLE_MORELLO_CAP=1" +EDK_COMPILER = "CLANGDWARF" + +export CLANGDWARF_BIN = "${LLVM_PATH}/" +export PACKAGES_PATH = "${S}:${S}/edk2-platforms:${WORKDIR}/edk2-non-osi"
CC:remove = "${CC_PURECAP_FLAGS}" CXX:remove = "${CC_PURECAP_FLAGS}" diff --git a/meta-morello/recipes-bsp/uefi/files/0001-Basetools-remove-brotli-build-errors.patch b/meta-morello/recipes-bsp/uefi/files/0001-Basetools-remove-brotli-build-errors.patch deleted file mode 100644 index 53d16ad..0000000 --- a/meta-morello/recipes-bsp/uefi/files/0001-Basetools-remove-brotli-build-errors.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 27dd7265403d8e8fed99a854b9c3e1db7d79525f Mon Sep 17 00:00:00 2001 -From: Jeremy Maitin-Shepard jbms@google.com -Date: Tue, 14 Sep 2021 12:27:45 -0700 -Subject: [PATCH 09/22] Fix -Werror=vla-parameter errors with GCC 11.2.0 - ---- - BaseTools/Source/C/BrotliCompress/brotli/c/dec/decode.c | 6 ++++-- - BaseTools/Source/C/BrotliCompress/brotli/c/enc/encode.c | 5 +++-- - 2 files changed, 7 insertions(+), 4 deletions(-) - -diff --git a/BaseTools/Source/C/BrotliCompress/brotli/c/dec/decode.c b/c/dec/decode.c -index 114c505..4c89a73 100644 ---- a/BaseTools/Source/C/BrotliCompress/brotli/c/dec/decode.c -+++ b/BaseTools/Source/C/BrotliCompress/brotli/c/dec/decode.c -@@ -2030,8 +2030,10 @@ static BROTLI_NOINLINE BrotliDecoderErrorCode SafeProcessCommands( - } - - BrotliDecoderResult BrotliDecoderDecompress( -- size_t encoded_size, const uint8_t* encoded_buffer, size_t* decoded_size, -- uint8_t* decoded_buffer) { -+ size_t encoded_size, -+ const uint8_t encoded_buffer[BROTLI_ARRAY_PARAM(encoded_size)], -+ size_t* decoded_size, -+ uint8_t decoded_buffer[BROTLI_ARRAY_PARAM(*decoded_size)]) { - BrotliDecoderState s; - BrotliDecoderResult result; - size_t total_out = 0; -diff --git a/BaseTools/Source/C/BrotliCompress/brotli/c/enc/encode.c b/c/enc/encode.c -index 68548ef..dc3704e 100644 ---- a/BaseTools/Source/C/BrotliCompress/brotli/c/enc/encode.c -+++ b/BaseTools/Source/C/BrotliCompress/brotli/c/enc/encode.c -@@ -1470,8 +1470,9 @@ static size_t MakeUncompressedStream( - - BROTLI_BOOL BrotliEncoderCompress( - int quality, int lgwin, BrotliEncoderMode mode, size_t input_size, -- const uint8_t* input_buffer, size_t* encoded_size, -- uint8_t* encoded_buffer) { -+ const uint8_t input_buffer[BROTLI_ARRAY_PARAM(input_size)], -+ size_t* encoded_size, -+ uint8_t encoded_buffer[BROTLI_ARRAY_PARAM(*encoded_size)]) { - BrotliEncoderState* s; - size_t out_size = *encoded_size; - const uint8_t* input_start = input_buffer; --- -2.34.1 \ No newline at end of file