All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Vincent Stehlé" <vincent.stehle@arm.com>
To: buildroot@buildroot.org
Cc: "Vincent Stehlé" <vincent.stehle@arm.com>,
	"Thomas Petazzoni" <thomas.petazzoni@bootlin.com>
Subject: [Buildroot] [PATCH 2/3 next] package/edk2-non-osi: new package
Date: Thu,  1 Dec 2022 19:33:36 +0100	[thread overview]
Message-ID: <20221201183337.1588407-3-vincent.stehle@arm.com> (raw)
In-Reply-To: <20221201183337.1588407-1-vincent.stehle@arm.com>

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é <vincent.stehle@arm.com>
Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
---

This is for the `next' branch, please.

 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   | 29 ++++++++++++++++++++++++++
 5 files changed, 45 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 ab9cfe5ee98..233fda4c71d 100644
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -3002,6 +3002,7 @@ F:	package/utp_com/
 N:	Vincent Stehlé <vincent.stehle@arm.com>
 F:	board/qemu/aarch64-ebbr/
 F:	configs/qemu_aarch64_ebbr_defconfig
+F:	package/edk2-non-osi/
 
 N:	Vincent Stehlé <vincent.stehle@laposte.net>
 F:	board/bananapi/bananapi-m2-zero/
diff --git a/package/Config.in b/package/Config.in
index 1a2bda4639e..ce0d55bbf2f 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 00000000000..6c540c8a408
--- /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 00000000000..7941df1f2fc
--- /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 00000000000..5cd08c03de5
--- /dev/null
+++ b/package/edk2-non-osi/edk2-non-osi.mk
@@ -0,0 +1,29 @@
+################################################################################
+#
+# 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
+	mkdir -p $(STAGING_DIR)/usr/share/edk2-non-osi
+
+	for d in $(EDK2_NON_OSI_DIRS); do \
+		mkdir -p $(STAGING_DIR)/usr/share/edk2-non-osi/$$d; \
+		cp -rf $(@D)/$$d/* $(STAGING_DIR)/usr/share/edk2-non-osi/$$d/; \
+	done
+endef
+
+$(eval $(generic-package))
-- 
2.35.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

  parent reply	other threads:[~2022-12-01 18:34 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-12-01 18:33 [Buildroot] [PATCH 0/3 next] bump edk2 version Vincent Stehlé
2022-12-01 18:33 ` [Buildroot] [PATCH 1/3 next] package/edk2-platforms: bump in sync with edk2-stable202208 Vincent Stehlé
2022-12-04 13:05   ` Thomas Petazzoni via buildroot
2022-12-01 18:33 ` Vincent Stehlé [this message]
2022-12-04 13:08   ` [Buildroot] [PATCH 2/3 next] package/edk2-non-osi: new package Thomas Petazzoni via buildroot
2022-12-01 18:33 ` [Buildroot] [PATCH 3/3 next] boot/edk2: bump version to edk2-stable202208 Vincent Stehlé

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20221201183337.1588407-3-vincent.stehle@arm.com \
    --to=vincent.stehle@arm.com \
    --cc=buildroot@buildroot.org \
    --cc=thomas.petazzoni@bootlin.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.