* [PATCH] Use xen dtb if xen image is present
@ 2020-03-18 11:49 rahul.singh
2020-03-19 8:02 ` [meta-arm] " Bertrand Marquis
0 siblings, 1 reply; 3+ messages in thread
From: rahul.singh @ 2020-03-18 11:49 UTC (permalink / raw)
To: meta-arm; +Cc: nd
Use xen dtb if xen image is present for foundation
and fvp pltaform.
Change-Id: I8ee0c5f59ea731202ca97c2cdef315cc5e6665e6
Signed-off-by: Rahul Singh <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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [meta-arm] [PATCH] Use xen dtb if xen image is present
2020-03-18 11:49 [PATCH] Use xen dtb if xen image is present rahul.singh
@ 2020-03-19 8:02 ` Bertrand Marquis
2020-03-19 20:33 ` Jon Mason
0 siblings, 1 reply; 3+ messages in thread
From: Bertrand Marquis @ 2020-03-19 8:02 UTC (permalink / raw)
To: meta-arm@lists.yoctoproject.org; +Cc: nd
[-- Attachment #1: Type: text/plain, Size: 4093 bytes --]
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.
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>>
[-- Attachment #2: Type: text/html, Size: 7096 bytes --]
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [meta-arm] [PATCH] Use xen dtb if xen image is present
2020-03-19 8:02 ` [meta-arm] " Bertrand Marquis
@ 2020-03-19 20:33 ` Jon Mason
0 siblings, 0 replies; 3+ messages in thread
From: Jon Mason @ 2020-03-19 20:33 UTC (permalink / raw)
To: meta-arm
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>>
>
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-03-19 20:33 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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 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.