From: Debbie Martin <Debbie.Martin@arm.com>
To: meta-arm@lists.yoctoproject.org
Subject: [PATCH 1/5] arm-bsp/u-boot: Divide the U-boot configuration by machine
Date: Fri, 20 Oct 2023 13:31:35 +0100 [thread overview]
Message-ID: <20231020123139.339204-1-Debbie.Martin@arm.com> (raw)
Have separate machine include files rather than multiple
machine-specific settings in the same file.
Signed-off-by: Debbie Martin <Debbie.Martin@arm.com>
---
.../u-boot/u-boot-corstone1000.inc | 59 +++++++++++++
.../recipes-bsp/u-boot/u-boot-fvp-base.inc | 5 ++
.../recipes-bsp/u-boot/u-boot-juno.inc | 3 +
meta-arm-bsp/recipes-bsp/u-boot/u-boot-tc.inc | 5 ++
.../recipes-bsp/u-boot/u-boot_%.bbappend | 83 ++-----------------
5 files changed, 78 insertions(+), 77 deletions(-)
create mode 100644 meta-arm-bsp/recipes-bsp/u-boot/u-boot-corstone1000.inc
create mode 100644 meta-arm-bsp/recipes-bsp/u-boot/u-boot-fvp-base.inc
create mode 100644 meta-arm-bsp/recipes-bsp/u-boot/u-boot-juno.inc
create mode 100644 meta-arm-bsp/recipes-bsp/u-boot/u-boot-tc.inc
diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot-corstone1000.inc b/meta-arm-bsp/recipes-bsp/u-boot/u-boot-corstone1000.inc
new file mode 100644
index 00000000..e978e06a
--- /dev/null
+++ b/meta-arm-bsp/recipes-bsp/u-boot/u-boot-corstone1000.inc
@@ -0,0 +1,59 @@
+# Corstone1000 specific U-boot support
+
+DEPENDS:append = " gnutls-native openssl-native efitools-native"
+CORSTONE1000_DEVICE_TREE:corstone1000-mps3 = "corstone1000-mps3"
+CORSTONE1000_DEVICE_TREE:corstone1000-fvp = "corstone1000-fvp"
+EXTRA_OEMAKE:append = ' DEVICE_TREE=${CORSTONE1000_DEVICE_TREE}'
+
+SYSROOT_DIRS:append = " /boot"
+
+SRC_URI:append = " \
+ file://0001-FF-A-v15-arm64-smccc-add-support-for-SMCCCv1.2-x0-x1.patch \
+ file://0002-FF-A-v15-lib-uuid-introduce-uuid_str_to_le_bin-funct.patch \
+ file://0003-FF-A-v15-lib-uuid-introduce-testcase-for-uuid_str_to.patch \
+ file://0004-FF-A-v15-arm_ffa-introduce-Arm-FF-A-support.patch \
+ file://0005-FF-A-v15-arm_ffa-introduce-armffa-command.patch \
+ file://0006-FF-A-v15-arm_ffa-introduce-sandbox-FF-A-support.patch \
+ file://0007-FF-A-v15-arm_ffa-introduce-sandbox-test-cases-for-UC.patch \
+ file://0008-FF-A-v15-arm_ffa-introduce-armffa-command-Sandbox-te.patch \
+ file://0009-FF-A-v15-arm_ffa-efi-introduce-FF-A-MM-communication.patch \
+ file://0010-FF-A-v15-arm_ffa-efi-corstone1000-enable-MM-communic.patch \
+ file://0011-efi-corstone1000-fwu-introduce-EFI-capsule-update.patch \
+ file://0012-arm-corstone1000-fix-unrecognized-filesystem-type.patch \
+ file://0013-efi_loader-corstone1000-remove-guid-check-from-corst.patch \
+ file://0014-efi_loader-populate-ESRT-table-if-EFI_ESRT-config-op.patch \
+ file://0015-efi_firmware-add-get_image_info-for-corstone1000.patch \
+ file://0016-efi_loader-fix-null-pointer-exception-with-get_image.patch \
+ file://0017-arm-corstone1000-add-mmc-for-fvp.patch \
+ file://0018-corstone1000-add-compressed-kernel-support.patch \
+ file://0019-arm-corstone1000-esrt-support.patch \
+ file://0020-corstone1000-enable-distro-booting-command.patch \
+ file://0021-corstone1000-add-fwu-metadata-store-info.patch \
+ file://0022-fwu_metadata-make-sure-structures-are-packed.patch \
+ file://0023-corstone1000-add-boot-index.patch \
+ file://0024-corstone1000-adjust-boot-bank-and-kernel-location.patch \
+ file://0025-corstone1000-add-nvmxip-fwu-mdata-and-gpt-options.patch \
+ file://0026-nvmxip-move-header-to-include.patch \
+ file://0027-corstone1000-set-kernel_addr-based-on-boot_idx.patch \
+ file://0028-corstone1000-boot-index-from-active.patch \
+ file://0029-corstone1000-enable-PSCI-reset.patch \
+ file://0030-Enable-EFI-set-get-time-services.patch \
+ file://0031-corstone1000-detect-inflated-kernel-size.patch \
+ file://0032-corstone1000-ESRT-add-unique-firmware-GUID.patch \
+ file://0033-dt-Provide-a-way-to-remove-non-compliant-nodes-and-p.patch \
+ file://0034-bootefi-Call-the-EVT_FT_FIXUP-event-handler.patch \
+ file://0035-corstone1000-purge-U-Boot-specific-DT-nodes.patch \
+ file://0036-corstone1000-add-signature-device-tree-overlay.patch \
+ file://0037-corstone1000-enable-authenticated-capsule-config.patch \
+ file://0038-corstone1000-introduce-EFI-authenticated-capsule-upd.patch \
+ "
+
+do_configure:append(){
+ openssl req -x509 -sha256 -newkey rsa:2048 -subj /CN=CRT/ -keyout ${B}/CRT.key -out ${B}/CRT.crt -nodes -days 365
+ cert-to-efi-sig-list ${B}/CRT.crt ${B}/corstone1000_defconfig/CRT.esl
+}
+
+do_install:append() {
+ install -D -p -m 0644 ${B}/CRT.crt ${DEPLOY_DIR_IMAGE}/corstone1000_capsule_cert.crt
+ install -D -p -m 0644 ${B}/CRT.key ${DEPLOY_DIR_IMAGE}/corstone1000_capsule_key.key
+}
diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot-fvp-base.inc b/meta-arm-bsp/recipes-bsp/u-boot/u-boot-fvp-base.inc
new file mode 100644
index 00000000..21046724
--- /dev/null
+++ b/meta-arm-bsp/recipes-bsp/u-boot/u-boot-fvp-base.inc
@@ -0,0 +1,5 @@
+# FVP base specific U-boot support
+
+SRC_URI:append = " file://bootargs.cfg \
+ file://0001-Revert-vexpress64-pick-DRAM-size-from-DT.patch \
+ "
diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot-juno.inc b/meta-arm-bsp/recipes-bsp/u-boot/u-boot-juno.inc
new file mode 100644
index 00000000..e49d87c2
--- /dev/null
+++ b/meta-arm-bsp/recipes-bsp/u-boot/u-boot-juno.inc
@@ -0,0 +1,3 @@
+# Juno specific U-boot support
+
+SRC_URI:append = " file://0001-configs-vexpress-modify-to-boot-compressed-initramfs.patch"
diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot-tc.inc b/meta-arm-bsp/recipes-bsp/u-boot/u-boot-tc.inc
new file mode 100644
index 00000000..ca182c55
--- /dev/null
+++ b/meta-arm-bsp/recipes-bsp/u-boot/u-boot-tc.inc
@@ -0,0 +1,5 @@
+# TC0 and TC1 specific U-boot support
+
+SRC_URI:append = " \
+ file://bootargs.cfg \
+ "
diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot_%.bbappend b/meta-arm-bsp/recipes-bsp/u-boot/u-boot_%.bbappend
index 4989ff61..11f332ad 100644
--- a/meta-arm-bsp/recipes-bsp/u-boot/u-boot_%.bbappend
+++ b/meta-arm-bsp/recipes-bsp/u-boot/u-boot_%.bbappend
@@ -1,81 +1,10 @@
FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
-#
-# Corstone1000 64-bit machines
-#
-DEPENDS:append:corstone1000 = " gnutls-native openssl-native efitools-native"
-CORSTONE1000_DEVICE_TREE:corstone1000-mps3 = "corstone1000-mps3"
-CORSTONE1000_DEVICE_TREE:corstone1000-fvp = "corstone1000-fvp"
-EXTRA_OEMAKE:append:corstone1000 = ' DEVICE_TREE=${CORSTONE1000_DEVICE_TREE}'
+MACHINE_U-BOOT_REQUIRE ?= ""
+MACHINE_U-BOOT_REQUIRE:corstone1000 = "u-boot-corstone1000.inc"
+MACHINE_U-BOOT_REQUIRE:fvp-base = "u-boot-fvp-base.inc"
+MACHINE_U-BOOT_REQUIRE:juno = "u-boot-juno.inc"
+MACHINE_U-BOOT_REQUIRE:tc = "u-boot-tc.inc"
-SYSROOT_DIRS:append:corstone1000 = " /boot"
+require ${MACHINE_U-BOOT_REQUIRE}
-SRC_URI:append:corstone1000 = " \
- file://0001-FF-A-v15-arm64-smccc-add-support-for-SMCCCv1.2-x0-x1.patch \
- file://0002-FF-A-v15-lib-uuid-introduce-uuid_str_to_le_bin-funct.patch \
- file://0003-FF-A-v15-lib-uuid-introduce-testcase-for-uuid_str_to.patch \
- file://0004-FF-A-v15-arm_ffa-introduce-Arm-FF-A-support.patch \
- file://0005-FF-A-v15-arm_ffa-introduce-armffa-command.patch \
- file://0006-FF-A-v15-arm_ffa-introduce-sandbox-FF-A-support.patch \
- file://0007-FF-A-v15-arm_ffa-introduce-sandbox-test-cases-for-UC.patch \
- file://0008-FF-A-v15-arm_ffa-introduce-armffa-command-Sandbox-te.patch \
- file://0009-FF-A-v15-arm_ffa-efi-introduce-FF-A-MM-communication.patch \
- file://0010-FF-A-v15-arm_ffa-efi-corstone1000-enable-MM-communic.patch \
- file://0011-efi-corstone1000-fwu-introduce-EFI-capsule-update.patch \
- file://0012-arm-corstone1000-fix-unrecognized-filesystem-type.patch \
- file://0013-efi_loader-corstone1000-remove-guid-check-from-corst.patch \
- file://0014-efi_loader-populate-ESRT-table-if-EFI_ESRT-config-op.patch \
- file://0015-efi_firmware-add-get_image_info-for-corstone1000.patch \
- file://0016-efi_loader-fix-null-pointer-exception-with-get_image.patch \
- file://0017-arm-corstone1000-add-mmc-for-fvp.patch \
- file://0018-corstone1000-add-compressed-kernel-support.patch \
- file://0019-arm-corstone1000-esrt-support.patch \
- file://0020-corstone1000-enable-distro-booting-command.patch \
- file://0021-corstone1000-add-fwu-metadata-store-info.patch \
- file://0022-fwu_metadata-make-sure-structures-are-packed.patch \
- file://0023-corstone1000-add-boot-index.patch \
- file://0024-corstone1000-adjust-boot-bank-and-kernel-location.patch \
- file://0025-corstone1000-add-nvmxip-fwu-mdata-and-gpt-options.patch \
- file://0026-nvmxip-move-header-to-include.patch \
- file://0027-corstone1000-set-kernel_addr-based-on-boot_idx.patch \
- file://0028-corstone1000-boot-index-from-active.patch \
- file://0029-corstone1000-enable-PSCI-reset.patch \
- file://0030-Enable-EFI-set-get-time-services.patch \
- file://0031-corstone1000-detect-inflated-kernel-size.patch \
- file://0032-corstone1000-ESRT-add-unique-firmware-GUID.patch \
- file://0033-dt-Provide-a-way-to-remove-non-compliant-nodes-and-p.patch \
- file://0034-bootefi-Call-the-EVT_FT_FIXUP-event-handler.patch \
- file://0035-corstone1000-purge-U-Boot-specific-DT-nodes.patch \
- file://0036-corstone1000-add-signature-device-tree-overlay.patch \
- file://0037-corstone1000-enable-authenticated-capsule-config.patch \
- file://0038-corstone1000-introduce-EFI-authenticated-capsule-upd.patch \
- "
-
-do_configure:append:corstone1000(){
- openssl req -x509 -sha256 -newkey rsa:2048 -subj /CN=CRT/ -keyout ${B}/CRT.key -out ${B}/CRT.crt -nodes -days 365
- cert-to-efi-sig-list ${B}/CRT.crt ${B}/corstone1000_defconfig/CRT.esl
-}
-
-do_install:append:corstone1000() {
- install -D -p -m 0644 ${B}/CRT.crt ${DEPLOY_DIR_IMAGE}/corstone1000_capsule_cert.crt
- install -D -p -m 0644 ${B}/CRT.key ${DEPLOY_DIR_IMAGE}/corstone1000_capsule_key.key
-}
-
-#
-# FVP BASE
-#
-SRC_URI:append:fvp-base = " file://bootargs.cfg \
- file://0001-Revert-vexpress64-pick-DRAM-size-from-DT.patch \
- "
-#
-# Juno Machines
-#
-SRC_URI:append:juno = " file://0001-configs-vexpress-modify-to-boot-compressed-initramfs.patch"
-
-
-#
-# TC0 and TC1 MACHINES
-#
-SRC_URI:append:tc = " \
- file://bootargs.cfg \
- "
--
2.25.1
next reply other threads:[~2023-10-20 12:32 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-20 12:31 Debbie Martin [this message]
2023-10-25 1:29 ` [PATCH 1/5] arm-bsp/u-boot: Divide the U-boot configuration by machine Jon Mason
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=20231020123139.339204-1-Debbie.Martin@arm.com \
--to=debbie.martin@arm.com \
--cc=meta-arm@lists.yoctoproject.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).