From 95f72fb61aae6a64ea822b535cf9d2c2e01e6fc9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vincent=20Stehl=C3=A9?= Date: Thu, 1 Dec 2022 19:33:36 +0100 Subject: [PATCH] package/edk2-non-osi: new package MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add a package to install the additional edk2 platforms files, not compatible with the normal licensing requirements and held in the edk2-non-osi repository. Only the Marvell Armada files are copied at this point, to support building edk2 for the MACCHIATObin platform. The referenced commit corresponds to version edk2-stable202208 of edk2, based on the timestamps. This package is heavily inspired from package/edk2-platforms. Signed-off-by: Vincent Stehlé Cc: Thomas Petazzoni Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/edk2-non-osi/Config.in | 11 +++++++++++ package/edk2-non-osi/edk2-non-osi.hash | 3 +++ package/edk2-non-osi/edk2-non-osi.mk | 27 ++++++++++++++++++++++++++ 5 files changed, 43 insertions(+) create mode 100644 package/edk2-non-osi/Config.in create mode 100644 package/edk2-non-osi/edk2-non-osi.hash create mode 100644 package/edk2-non-osi/edk2-non-osi.mk diff --git a/DEVELOPERS b/DEVELOPERS index ab9cfe5ee9..233fda4c71 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -3002,6 +3002,7 @@ F: package/utp_com/ N: Vincent Stehlé F: board/qemu/aarch64-ebbr/ F: configs/qemu_aarch64_ebbr_defconfig +F: package/edk2-non-osi/ N: Vincent Stehlé F: board/bananapi/bananapi-m2-zero/ diff --git a/package/Config.in b/package/Config.in index 1a2bda4639..ce0d55bbf2 100644 --- a/package/Config.in +++ b/package/Config.in @@ -489,6 +489,7 @@ endmenu source "package/dvb-apps/Config.in" source "package/dvbsnoop/Config.in" source "package/edid-decode/Config.in" + source "package/edk2-non-osi/Config.in" source "package/edk2-platforms/Config.in" source "package/eudev/Config.in" source "package/ev3dev-linux-drivers/Config.in" diff --git a/package/edk2-non-osi/Config.in b/package/edk2-non-osi/Config.in new file mode 100644 index 0000000000..6c540c8a40 --- /dev/null +++ b/package/edk2-non-osi/Config.in @@ -0,0 +1,11 @@ +config BR2_PACKAGE_EDK2_NON_OSI + bool + help + EDK2 description files for additional platforms, not + compatible with the normal licensing requirements. + The main EDK2 bootloader package will depend on these + description files while building firmware for some platforms. + + Only the Marvell Armada files are copied at this point. + + https://github.com/tianocore/edk2-non-osi diff --git a/package/edk2-non-osi/edk2-non-osi.hash b/package/edk2-non-osi/edk2-non-osi.hash new file mode 100644 index 0000000000..7941df1f2f --- /dev/null +++ b/package/edk2-non-osi/edk2-non-osi.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 7d27b1e6d90a26f3585ab58a2e051da69eae1b97754d3e2d80a5372879ae2501 edk2-non-osi-61662e8596dd9a64e3372f9a3ba6622d2628607c.tar.gz +sha256 38d73db2f9dfb32e1666d898cb9d7c1ccd78302dd9922d5fac4a9cf61fa872d9 Silicon/Marvell/Armada7k8k/DeviceTree/Armada80x0McBin.inf diff --git a/package/edk2-non-osi/edk2-non-osi.mk b/package/edk2-non-osi/edk2-non-osi.mk new file mode 100644 index 0000000000..0abb3770c7 --- /dev/null +++ b/package/edk2-non-osi/edk2-non-osi.mk @@ -0,0 +1,27 @@ +################################################################################ +# +# edk2-non-osi +# +################################################################################ + +# Keep in sync with latest commit as of the release date for boot/edk2 +EDK2_NON_OSI_VERSION = 61662e8596dd9a64e3372f9a3ba6622d2628607c +EDK2_NON_OSI_SITE = $(call github,tianocore,edk2-non-osi,$(EDK2_NON_OSI_VERSION)) +EDK2_NON_OSI_INSTALL_TARGET = NO +EDK2_NON_OSI_INSTALL_STAGING = YES + +# Copy Marvell Armada files +EDK2_NON_OSI_LICENSE += BSD-2-Clause-Patent (Marvell Armada) +EDK2_NON_OSI_LICENSE_FILES += Silicon/Marvell/Armada7k8k/DeviceTree/Armada80x0McBin.inf +EDK2_NON_OSI_DIRS += Silicon/Marvell/Armada7k8k/DeviceTree + +# There is nothing to build for edk2-non-osi. All we need to do is to copy +# the selected description files to staging, for other packages to build with. +define EDK2_NON_OSI_INSTALL_STAGING_CMDS + $(foreach d,$(EDK2_NON_OSI_DIRS),\ + mkdir -p $(STAGING_DIR)/usr/share/edk2-non-osi/$(d) && \ + cp -rf $(@D)/$(d)/* $(STAGING_DIR)/usr/share/edk2-non-osi/$(d)/ + ) +endef + +$(eval $(generic-package))