From 17cb635a8a2dde2fbd7b21ba8639862e282027dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vincent=20Stehl=C3=A9?= Date: Thu, 1 Dec 2022 19:33:37 +0100 Subject: [PATCH] boot/edk2: bump version to edk2-stable202208 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The Marvell Armada Devicetree files have been moved out of edk2-platforms by commit 4b53da6b12a8 ("Marvell/Armada7k8k: Remove device tree sources from edk2-platforms") and they are now in edk2-non-osi. Therefore update the MACCHIATObin recipe to depend on the new edk2-non-osi package and rework a bit the packages path to support that. Also, drop the backported patch as it is not necessary anymore. Signed-off-by: Vincent Stehlé Cc: Dick Olsson Signed-off-by: Thomas Petazzoni --- ...ePkg-UsbBusDxe-fix-NOOPT-build-error.patch | 48 ------------------- boot/edk2/Config.in | 1 + boot/edk2/edk2.hash | 2 +- boot/edk2/edk2.mk | 9 ++-- 4 files changed, 8 insertions(+), 52 deletions(-) delete mode 100644 boot/edk2/0001-MdeModulePkg-UsbBusDxe-fix-NOOPT-build-error.patch diff --git a/boot/edk2/0001-MdeModulePkg-UsbBusDxe-fix-NOOPT-build-error.patch b/boot/edk2/0001-MdeModulePkg-UsbBusDxe-fix-NOOPT-build-error.patch deleted file mode 100644 index f4f1b1565a..0000000000 --- a/boot/edk2/0001-MdeModulePkg-UsbBusDxe-fix-NOOPT-build-error.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 59aa67f7a4d8efc564b46fe467aaf6eccec17183 Mon Sep 17 00:00:00 2001 -From: Gerd Hoffmann -Date: Mon, 20 Dec 2021 22:32:38 +0800 -Subject: [PATCH] MdeModulePkg/UsbBusDxe: fix NOOPT build error - -gcc-11 (fedora 35): - -/home/kraxel/projects/edk2/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBus.c: In function ?UsbIoBulkTransfer?: -/home/kraxel/projects/edk2/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBus.c:277:12: error: ?UsbHcBulkTransfer? accessing 80 bytes in a region of size 8 [-Werror=stringop-overflow=] - -Signed-off-by: Gerd Hoffmann -Reviewed-by: Hao A Wu -(cherry picked from commit ae8272ef787d80950803c521a13a308651bdc62e) -Signed-off-by: Romain Naour ---- - MdeModulePkg/Bus/Usb/UsbBusDxe/UsbUtility.c | 2 +- - MdeModulePkg/Bus/Usb/UsbBusDxe/UsbUtility.h | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbUtility.c b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbUtility.c -index 7529e03e85..b2ce97ca37 100644 ---- a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbUtility.c -+++ b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbUtility.c -@@ -285,7 +285,7 @@ UsbHcBulkTransfer ( - IN UINT8 DevSpeed, - IN UINTN MaxPacket, - IN UINT8 BufferNum, -- IN OUT VOID *Data[EFI_USB_MAX_BULK_BUFFER_NUM], -+ IN OUT VOID *Data[], - IN OUT UINTN *DataLength, - IN OUT UINT8 *DataToggle, - IN UINTN TimeOut, -diff --git a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbUtility.h b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbUtility.h -index 1d2b8a6174..1316a5981f 100644 ---- a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbUtility.h -+++ b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbUtility.h -@@ -149,7 +149,7 @@ UsbHcBulkTransfer ( - IN UINT8 DevSpeed, - IN UINTN MaxPacket, - IN UINT8 BufferNum, -- IN OUT VOID *Data[EFI_USB_MAX_BULK_BUFFER_NUM], -+ IN OUT VOID *Data[], - IN OUT UINTN *DataLength, - IN OUT UINT8 *DataToggle, - IN UINTN TimeOut, --- -2.35.3 - diff --git a/boot/edk2/Config.in b/boot/edk2/Config.in index df723122ee..855a62f70b 100644 --- a/boot/edk2/Config.in +++ b/boot/edk2/Config.in @@ -88,6 +88,7 @@ config BR2_TARGET_EDK2_PLATFORM_SOLIDRUN_ARMADA80X0MCBIN bool "SolidRun MacchiatoBin" depends on BR2_aarch64 depends on BR2_TARGET_ARM_TRUSTED_FIRMWARE + select BR2_PACKAGE_EDK2_NON_OSI select BR2_PACKAGE_HOST_DTC select BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP help diff --git a/boot/edk2/edk2.hash b/boot/edk2/edk2.hash index f28e9ce841..94ee22ddc4 100644 --- a/boot/edk2/edk2.hash +++ b/boot/edk2/edk2.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 04791c13b414a6d1877182a6d565cb762c30aa63e49bb4d495fca68ef4dd209d edk2-edk2-stable202102-br1.tar.gz +sha256 c10520f269557d566e35fe8104141aa2865f9085ad2b3a30aae8a7e78a3ca5aa edk2-edk2-stable202208-br1.tar.gz sha256 50ce20c9cfdb0e19ee34fe0a51fc0afe961f743697b068359ab2f862b494df80 License.txt diff --git a/boot/edk2/edk2.mk b/boot/edk2/edk2.mk index 5cbd9d152e..c377b49877 100644 --- a/boot/edk2/edk2.mk +++ b/boot/edk2/edk2.mk @@ -4,7 +4,7 @@ # ################################################################################ -EDK2_VERSION = edk2-stable202102 +EDK2_VERSION = edk2-stable202208 EDK2_SITE = https://github.com/tianocore/edk2 EDK2_SITE_METHOD = git EDK2_LICENSE = BSD-2-Clause @@ -47,7 +47,7 @@ endif EDK2_GIT_SUBMODULES = YES EDK2_BUILD_PACKAGES = $(@D)/Build/Buildroot -EDK2_PACKAGES_PATH = $(@D):$(EDK2_BUILD_PACKAGES):$(STAGING_DIR)/usr/share/edk2-platforms +EDK2_PACKAGES_PATHS = $(@D) $(EDK2_BUILD_PACKAGES) $(STAGING_DIR)/usr/share/edk2-platforms ifeq ($(BR2_TARGET_EDK2_PLATFORM_OVMF_I386),y) EDK2_ARCH = IA32 @@ -102,12 +102,13 @@ endef else ifeq ($(BR2_TARGET_EDK2_PLATFORM_SOLIDRUN_ARMADA80X0MCBIN),y) EDK2_ARCH = AARCH64 -EDK2_DEPENDENCIES += host-dtc arm-trusted-firmware +EDK2_DEPENDENCIES += host-dtc arm-trusted-firmware edk2-non-osi EDK2_PACKAGE_NAME = Platform/SolidRun/Armada80x0McBin EDK2_PLATFORM_NAME = Armada80x0McBin EDK2_BUILD_DIR = $(EDK2_PLATFORM_NAME)-$(EDK2_ARCH) EDK2_BUILD_ENV += DTC_PREFIX=$(HOST_DIR)/bin/ EDK2_BUILD_OPTS += -D INCLUDE_TFTP_COMMAND +EDK2_PACKAGES_PATHS += $(STAGING_DIR)/usr/share/edk2-non-osi else ifeq ($(BR2_TARGET_EDK2_PLATFORM_QEMU_SBSA),y) EDK2_ARCH = AARCH64 @@ -128,6 +129,8 @@ EDK2_BASETOOLS_OPTS = \ EXTRA_LDFLAGS="$(HOST_LDFLAGS)" \ EXTRA_OPTFLAGS="$(HOST_CPPFLAGS)" +EDK2_PACKAGES_PATH = $(subst $(space),:,$(strip $(EDK2_PACKAGES_PATHS))) + EDK2_BUILD_ENV += \ WORKSPACE=$(@D) \ PACKAGES_PATH=$(EDK2_PACKAGES_PATH) \