mirrors/meta-arm
1
0
Fork 0
mirror of https://git.yoctoproject.org/meta-arm synced 2026-04-20 11:29:54 +00:00
Code Issues Projects Releases Wiki Activity

arm-autonomy: Append firmware-image-juno recipe to collect Xen binaries

Browse Source 
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>
Reviewed-By: Bertrand Marquis <bertrand.marquis@arm.com>
Signed-off-by: Jon Mason <jon.mason@arm.com>
This commit is contained in:
Diego Sueiro
2020-04-21 08:33:55 +01:00
committed by Jon Mason
parent d7b179b934
commit e921026326
6 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
meta-arm-autonomy/recipes-bsp/images/firmware-image-juno.bbappend Normal file
View File

@@ -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
}

2
meta-arm-autonomy/recipes-bsp/trusted-firmware-a/files/juno/images-r0.txt → meta-arm-autonomy/recipes-bsp/images/firmware-image-juno/images-r0.txt
View File

@@ -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

2
meta-arm-autonomy/recipes-bsp/trusted-firmware-a/files/juno/images-r1.txt → meta-arm-autonomy/recipes-bsp/images/firmware-image-juno/images-r1.txt
View File

@@ -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

2
meta-arm-autonomy/recipes-bsp/trusted-firmware-a/files/juno/images-r2.txt → meta-arm-autonomy/recipes-bsp/images/firmware-image-juno/images-r2.txt
View File

@@ -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

0
meta-arm-autonomy/recipes-bsp/trusted-firmware-a/files/juno/uEnv.txt → meta-arm-autonomy/recipes-bsp/images/firmware-image-juno/uEnv.txt
View File

13
meta-arm-autonomy/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.%.bbappend
View File

@@ -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
}