From: "Jon Mason" <jdmason@kudzu.us>
To: meta-arm@lists.yoctoproject.org
Subject: Re: [meta-arm] [PATCH] Use xen dtb if xen image is present
Date: Thu, 19 Mar 2020 16:33:14 -0400 [thread overview]
Message-ID: <20200319203313.GC27467@kudzu.us> (raw)
In-Reply-To: <E0E058E4-2B09-4DC2-ACD4-995919CC1970@arm.com>
On Thu, Mar 19, 2020 at 08:02:24AM +0000, Bertrand Marquis wrote:
>
>
> On 18 Mar 2020, at 11:49, Rahul Singh via Lists.Yoctoproject.Org<http://Lists.Yoctoproject.Org> <rahul.singh=arm.com@lists.yoctoproject.org<mailto:rahul.singh=arm.com@lists.yoctoproject.org>> wrote:
>
> Use xen dtb if xen image is present for foundation
> and fvp pltaform.
Applied to the master branch of meta-arm.
Thanks,
Jon
>
> Change-Id: I8ee0c5f59ea731202ca97c2cdef315cc5e6665e6
> Signed-off-by: Rahul Singh <rahul.singh@arm.com<mailto:rahul.singh@arm.com>>
> ---
> .../fvp-common/files/start-foundation-armv8.sh | 18 +++++++++++-------
> .../fvp-common/files/start-fvp-base.sh | 18 +++++++++++-------
> 2 files changed, 22 insertions(+), 14 deletions(-)
>
> diff --git a/meta-arm-bsp/recipes-devtools/fvp-common/files/start-foundation-armv8.sh b/meta-arm-bsp/recipes-devtools/fvp-common/files/start-foundation-armv8.sh
> index 1df4fd8..a113998 100755
> --- a/meta-arm-bsp/recipes-devtools/fvp-common/files/start-foundation-armv8.sh
> +++ b/meta-arm-bsp/recipes-devtools/fvp-common/files/start-foundation-armv8.sh
> @@ -12,7 +12,7 @@ source <(MACHINE=foundation-armv8 bitbake -e foundation-armv8-native | grep \
>
> # Bitbake image to run
> IMAGE_NAME="$(cd $DEPLOY_DIR_IMAGE; ls *-foundation-armv8.manifest | \
> - sed -e "s/-foundation-armv8\.manifest//")"
> + sed -e "s/-foundation-armv8\.manifest//" | head -1)"
>
> # BL1 and FIP files
> BL1_FILE="bl1-fvp.bin"
> @@ -210,6 +210,16 @@ if [ -n "$KERNEL_FILE" ]; then
> --data=$DEPLOY_DIR_IMAGE/$KERNEL_FILE@$KERNEL_ADDR"
> fi
>
> +# Add xen if present
> +if [ -n "$XEN_FILE" -a -f $DEPLOY_DIR_IMAGE/$XEN_FILE ]; then
> + FOUNDATION_PLAT_ARGS="$FOUNDATION_PLAT_ARGS \
> + --data=$DEPLOY_DIR_IMAGE/$XEN_FILE@$XEN_ADDR"
> + #switch dtb if there
> + if [ -f $DEPLOY_DIR_IMAGE/$(basename ${DTB_FILE} .dtb)-xen.dtb ]; then
> + DTB_FILE=$(basename ${DTB_FILE} .dtb)-xen.dtb
> + fi
> +fi
> +
> # Add DTB
> if [ -n "$DTB_FILE" ]; then
> if [ ! -f $DEPLOY_DIR_IMAGE/$DTB_FILE ]; then
> @@ -220,12 +230,6 @@ if [ -n "$DTB_FILE" ]; then
> --data=$DEPLOY_DIR_IMAGE/$DTB_FILE@$DTB_ADDR"
> fi
>
> -# Add xen if present
> -if [ -n "$XEN_FILE" -a -f $DEPLOY_DIR_IMAGE/$XEN_FILE ]; then
> - FOUNDATION_PLAT_ARGS="$FOUNDATION_PLAT_ARGS \
> - --data=$DEPLOY_DIR_IMAGE/$XEN_FILE@$XEN_ADDR"
> -fi
> -
> # Add disk if present
> if [ -n "$DISK_FILE" -a -f $DEPLOY_DIR_IMAGE/$DISK_FILE ]; then
> FOUNDATION_PLAT_ARGS="$FOUNDATION_PLAT_ARGS \
> diff --git a/meta-arm-bsp/recipes-devtools/fvp-common/files/start-fvp-base.sh b/meta-arm-bsp/recipes-devtools/fvp-common/files/start-fvp-base.sh
> index ab60cea..f391c23 100755
> --- a/meta-arm-bsp/recipes-devtools/fvp-common/files/start-fvp-base.sh
> +++ b/meta-arm-bsp/recipes-devtools/fvp-common/files/start-fvp-base.sh
> @@ -12,7 +12,7 @@ source <(MACHINE=fvp-base bitbake -e fvp-base-native | grep \
>
> # Bitbake image to run
> IMAGE_NAME="$(cd $DEPLOY_DIR_IMAGE; ls *-fvp-base.manifest | \
> - sed -e "s/-fvp-base\.manifest//")"
> + sed -e "s/-fvp-base\.manifest//" | head -1)"
>
> # BL1 and FIP files
> BL1_FILE="bl1-fvp.bin"
> @@ -202,6 +202,16 @@ if [ -n "$KERNEL_FILE" ]; then
> --data cluster0.cpu0=$DEPLOY_DIR_IMAGE/$KERNEL_FILE@$KERNEL_ADDR"
> fi
>
> +# Add xen if present
> +if [ -n "$XEN_FILE" -a -f $DEPLOY_DIR_IMAGE/$XEN_FILE ]; then
> + FVPARGS="$FVPARGS \
> + --data cluster0.cpu0=$DEPLOY_DIR_IMAGE/$XEN_FILE@$XEN_ADDR"
> + #switch dtb if there
> + if [ -f $DEPLOY_DIR_IMAGE/$(basename ${DTB_FILE} .dtb)-xen.dtb ]; then
> + DTB_FILE=$(basename ${DTB_FILE} .dtb)-xen.dtb
> + fi
> +fi
> +
> # Add DTB
> if [ -n "$DTB_FILE" ]; then
> if [ ! -f $DEPLOY_DIR_IMAGE/$DTB_FILE ]; then
> @@ -212,12 +222,6 @@ if [ -n "$DTB_FILE" ]; then
> --data cluster0.cpu0=$DEPLOY_DIR_IMAGE/$DTB_FILE@$DTB_ADDR"
> fi
>
> -# Add xen if present
> -if [ -n "$XEN_FILE" -a -f $DEPLOY_DIR_IMAGE/$XEN_FILE ]; then
> - FVPARGS="$FVPARGS \
> - --data cluster0.cpu0=$DEPLOY_DIR_IMAGE/$XEN_FILE@$XEN_ADDR"
> -fi
> -
> # Add disk if present
> if [ -n "$DISK_FILE" -a -f $DEPLOY_DIR_IMAGE/$DISK_FILE ]; then
> FVPARGS="$FVPARGS \
> --
> 2.17.1
>
>
> Reviewed-by: Bertrand Marquis <bertrand.marquis@arm.com<mailto:bertrand.marquis@arm.com>>
>
>
prev parent reply other threads:[~2020-03-19 20:33 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-18 11:49 [PATCH] Use xen dtb if xen image is present rahul.singh
2020-03-19 8:02 ` [meta-arm] " Bertrand Marquis
2020-03-19 20:33 ` Jon Mason [this message]
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=20200319203313.GC27467@kudzu.us \
--to=jdmason@kudzu.us \
--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 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.