All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Diego Sueiro" <diego.sueiro@arm.com>
To: meta-arm@lists.yoctoproject.org
Cc: nd@arm.com, Diego Sueiro <diego.sueiro@arm.com>
Subject: [PATCH 5/5] arm-autonomy: Append firmware-image-juno recipe to collect Xen binaries
Date: Tue, 21 Apr 2020 08:33:55 +0100	[thread overview]
Message-ID: <1587454435-46370-6-git-send-email-diego.sueiro@arm.com> (raw)
In-Reply-To: <1587454435-46370-1-git-send-email-diego.sueiro@arm.com>

For juno, the Xen binary and dtb are now collected by the
firmware-image-juno recipe instead of the trusted-firmware-a.

Change-Id: Iaf4e4821e80c09910771c57ba3dbd481626187d5
Issue-Id: SCM-754
Signed-off-by: Diego Sueiro <diego.sueiro@arm.com>
---
 .../recipes-bsp/images/firmware-image-juno.bbappend        | 14 ++++++++++++++
 .../juno => images/firmware-image-juno}/images-r0.txt      |  2 +-
 .../juno => images/firmware-image-juno}/images-r1.txt      |  2 +-
 .../juno => images/firmware-image-juno}/images-r2.txt      |  2 +-
 .../files/juno => images/firmware-image-juno}/uEnv.txt     |  0
 .../trusted-firmware-a/trusted-firmware-a_2.%.bbappend     | 13 -------------
 6 files changed, 17 insertions(+), 16 deletions(-)
 create mode 100644 meta-arm-autonomy/recipes-bsp/images/firmware-image-juno.bbappend
 rename meta-arm-autonomy/recipes-bsp/{trusted-firmware-a/files/juno => images/firmware-image-juno}/images-r0.txt (98%)
 rename meta-arm-autonomy/recipes-bsp/{trusted-firmware-a/files/juno => images/firmware-image-juno}/images-r1.txt (98%)
 rename meta-arm-autonomy/recipes-bsp/{trusted-firmware-a/files/juno => images/firmware-image-juno}/images-r2.txt (98%)
 rename meta-arm-autonomy/recipes-bsp/{trusted-firmware-a/files/juno => images/firmware-image-juno}/uEnv.txt (100%)
 delete mode 100644 meta-arm-autonomy/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.%.bbappend

diff --git a/meta-arm-autonomy/recipes-bsp/images/firmware-image-juno.bbappend b/meta-arm-autonomy/recipes-bsp/images/firmware-image-juno.bbappend
new file mode 100644
index 0000000..55b83d3
--- /dev/null
+++ b/meta-arm-autonomy/recipes-bsp/images/firmware-image-juno.bbappend
@@ -0,0 +1,14 @@
+FILESEXTRAPATHS_prepend_juno := "${@bb.utils.contains('DISTRO_FEATURES', 'xen', '${THISDIR}/${PN}:', '', d)}"
+
+INSTALL_EXTRA_DEPS_juno = "${@bb.utils.contains('DISTRO_FEATURES', 'xen', 'xen:do_deploy', '', d)}"
+
+do_install[depends] += "${INSTALL_EXTRA_DEPS}"
+
+do_install_append_juno() {
+    if [ "${@bb.utils.contains('DISTRO_FEATURES', 'xen', 'yes', 'no', d)}" = "yes" ]; then
+        cp  ${DEPLOY_DIR_IMAGE}/xen-${COMPATIBLE_MACHINE}.efi \
+            ${D}/${UNPACK_DIR}/SOFTWARE/xen
+        cp ${DEPLOY_DIR_IMAGE}/*xen.dtb \
+            ${D}/${UNPACK_DIR}/SOFTWARE/
+    fi
+}
diff --git a/meta-arm-autonomy/recipes-bsp/trusted-firmware-a/files/juno/images-r0.txt b/meta-arm-autonomy/recipes-bsp/images/firmware-image-juno/images-r0.txt
similarity index 98%
rename from meta-arm-autonomy/recipes-bsp/trusted-firmware-a/files/juno/images-r0.txt
rename to meta-arm-autonomy/recipes-bsp/images/firmware-image-juno/images-r0.txt
index 177cf09..ec32ca2 100644
--- a/meta-arm-autonomy/recipes-bsp/trusted-firmware-a/files/juno/images-r0.txt
+++ b/meta-arm-autonomy/recipes-bsp/images/firmware-image-juno/images-r0.txt
@@ -24,7 +24,7 @@ NOR2ENTRY: 00000000              ;Image Entry Point
 
 NOR3UPDATE: AUTO                 ;Image Update:NONE/AUTO/FORCE
 NOR3ADDRESS: 0x02700000          ;Image Flash Address
-NOR3FILE: \SOFTWARE\juno.dtb     ;Image File Name
+NOR3FILE: \SOFTWARE\juno-xen.dtb ;Image File Name
 NOR3NAME: board.dtb              ;Specify target filename to preserve file extension
 NOR3LOAD: 00000000               ;Image Load Address
 NOR3ENTRY: 00000000              ;Image Entry Point
diff --git a/meta-arm-autonomy/recipes-bsp/trusted-firmware-a/files/juno/images-r1.txt b/meta-arm-autonomy/recipes-bsp/images/firmware-image-juno/images-r1.txt
similarity index 98%
rename from meta-arm-autonomy/recipes-bsp/trusted-firmware-a/files/juno/images-r1.txt
rename to meta-arm-autonomy/recipes-bsp/images/firmware-image-juno/images-r1.txt
index ac40bf0..1372bc3 100644
--- a/meta-arm-autonomy/recipes-bsp/trusted-firmware-a/files/juno/images-r1.txt
+++ b/meta-arm-autonomy/recipes-bsp/images/firmware-image-juno/images-r1.txt
@@ -24,7 +24,7 @@ NOR2ENTRY: 00000000              ;Image Entry Point
 
 NOR3UPDATE: AUTO                 ;Image Update:NONE/AUTO/FORCE
 NOR3ADDRESS: 0x02700000          ;Image Flash Address
-NOR3FILE: \SOFTWARE\juno-r1.dtb  ;Image File Name
+NOR3FILE: \SOFTWARE\juno-r1-xen.dtb  ;Image File Name
 NOR3NAME: board.dtb              ;Specify target filename to preserve file extension
 NOR3LOAD: 00000000               ;Image Load Address
 NOR3ENTRY: 00000000              ;Image Entry Point
diff --git a/meta-arm-autonomy/recipes-bsp/trusted-firmware-a/files/juno/images-r2.txt b/meta-arm-autonomy/recipes-bsp/images/firmware-image-juno/images-r2.txt
similarity index 98%
rename from meta-arm-autonomy/recipes-bsp/trusted-firmware-a/files/juno/images-r2.txt
rename to meta-arm-autonomy/recipes-bsp/images/firmware-image-juno/images-r2.txt
index 423a574..def465e 100644
--- a/meta-arm-autonomy/recipes-bsp/trusted-firmware-a/files/juno/images-r2.txt
+++ b/meta-arm-autonomy/recipes-bsp/images/firmware-image-juno/images-r2.txt
@@ -24,7 +24,7 @@ NOR2ENTRY: 00000000              ;Image Entry Point
 
 NOR3UPDATE: AUTO                 ;Image Update:NONE/AUTO/FORCE
 NOR3ADDRESS: 0x02700000          ;Image Flash Address
-NOR3FILE: \SOFTWARE\juno-r2.dtb  ;Image File Name
+NOR3FILE: \SOFTWARE\juno-r2-xen.dtb  ;Image File Name
 NOR3NAME: board.dtb              ;Specify target filename to preserve file extension
 NOR3LOAD: 00000000               ;Image Load Address
 NOR3ENTRY: 00000000              ;Image Entry Point
diff --git a/meta-arm-autonomy/recipes-bsp/trusted-firmware-a/files/juno/uEnv.txt b/meta-arm-autonomy/recipes-bsp/images/firmware-image-juno/uEnv.txt
similarity index 100%
rename from meta-arm-autonomy/recipes-bsp/trusted-firmware-a/files/juno/uEnv.txt
rename to meta-arm-autonomy/recipes-bsp/images/firmware-image-juno/uEnv.txt
diff --git a/meta-arm-autonomy/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.%.bbappend b/meta-arm-autonomy/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.%.bbappend
deleted file mode 100644
index 49a8228..0000000
--- a/meta-arm-autonomy/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.%.bbappend
+++ /dev/null
@@ -1,13 +0,0 @@
-FILESEXTRAPATHS_prepend_juno := "${@bb.utils.contains('DISTRO_FEATURES', 'xen', '${THISDIR}/files/juno:', '', d)}"
-
-JUNO_EXTRA_DEPS_append = "${@bb.utils.contains('DISTRO_FEATURES', 'xen', ' xen:do_deploy', '', d)}"
-
-do_deploy_append_juno() {
-
-    if [ "${@bb.utils.contains('DISTRO_FEATURES', 'xen', 'yes', 'no', d)}" = "yes" ]; then
-        cp -a \
-            ${DEPLOY_DIR_IMAGE}/xen-${COMPATIBLE_MACHINE}.efi \
-            ${WORKDIR}/juno-oe-uboot/SOFTWARE/xen
-    fi
-
-}
-- 
2.7.4


  parent reply	other threads:[~2020-04-21  7:34 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-04-21  7:33 [PATCH 0/5] tf-a recipe improvements and new recipes for SCP and firmware image for Juno Diego Sueiro
2020-04-21  7:33 ` [PATCH 1/5] meta-arm-bsp:trusted-firmware-a: Remove custom do_clean task Diego Sueiro
2020-04-21  7:33 ` [PATCH 2/5] trusted-firmware-a: Deliver binaries artefacts to sysroot/firmware Diego Sueiro
2020-05-19  4:05   ` [meta-arm] " Denys Dmytriyenko
2020-05-19  6:10     ` Diego Sueiro
2020-05-19  6:40       ` Denys Dmytriyenko
2020-05-19  9:11         ` Diego Sueiro
2020-04-21  7:33 ` [PATCH 3/5] meta-arm-bsp: Introduce the scp-firmware-juno recipe Diego Sueiro
2020-04-21  7:33 ` [PATCH 4/5] meta-arm-bsp: Introduce firmware-image-juno recipe Diego Sueiro
2020-04-21  7:33 ` Diego Sueiro [this message]
2020-04-21  8:10 ` [meta-arm] [PATCH 0/5] tf-a recipe improvements and new recipes for SCP and firmware image for Juno Bertrand Marquis
2020-04-23 18:35   ` 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=1587454435-46370-6-git-send-email-diego.sueiro@arm.com \
    --to=diego.sueiro@arm.com \
    --cc=meta-arm@lists.yoctoproject.org \
    --cc=nd@arm.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.