Use xen dtb if xen image is present
PATCH 1/1 Use xen dtb if xen image is present
Use xen dtb if xen image is present for foundation and fvp pltaform.
--- .../fvp-common/files/start-foundation-armv8.sh | 18 +++++++++++------- .../fvp-common/files/start-fvp-base.sh | 18 +++++++++++------- 2 files changed, 22 insertions(+), 14 deletions(-)
meta-arm-bsp/recipes-devtools/fvp-common/files/start-foundation-armv8.sh +11 -7
@@ -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 \
meta-arm-bsp/recipes-devtools/fvp-common/files/start-fvp-base.sh +11 -7
@@ -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 \
Signature · 1 line
2.17.1
On 18 Mar 2020, at 11:49, Rahul Singh via Lists.Yoctoproject.Org<http://Lists.Yoctoproject.Org> <[email protected]<mailto:[email protected]>> wrote:
Use xen dtb if xen image is present for foundation and fvp pltaform.
---.../fvp-common/files/start-foundation-armv8.sh | 18 +++++++++++-------.../fvp-common/files/start-fvp-base.sh | 18 +++++++++++-------
2 files changed, 22 insertions(+), 14 deletions(-)
meta-arm-bsp/recipes-devtools/fvp-common/files/start-foundation-armv8.sh +0 -0
@@ -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 \
meta-arm-bsp/recipes-devtools/fvp-common/files/start-fvp-base.sh +0 -0
@@ -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
Jon Mason
AppliedQuoted 6 lines · Bertrand Marquis
On 18 Mar 2020, at 11:49, Rahul Singh via Lists.Yoctoproject.Org<http://Lists.Yoctoproject.Org> <[email protected]<mailto:[email protected]>> wrote:
Use xen dtb if xen image is present for foundation and fvp pltaform.
Applied to the master branch of meta-arm.
Thanks,
Jon
Quoted 102 lines
Change-Id I8ee0c5f59ea731202ca97c2cdef315cc5e6665e6---
.../fvp-common/files/start-foundation-armv8.sh| 18 +++++++++++-------.../fvp-common/files/start-fvp-base.sh| 18 +++++++++++-------2 files changed, 22 insertions(+), 14 deletions(-)meta-arm-bsp/recipes-devtools/fvp-common/files/start-foundation-armv8.sh +1
-1@@ -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 filesBL1_FILE="bl1-fvp.bin"
meta-arm-bsp/recipes-devtools/fvp-common/files/start-foundation-armv8.sh +0
-0@@ -210,6 +210,16 @@ if [ -n "$KERNEL_FILE" ]; then --data=$DEPLOY_DIR_IMAGE/$KERNEL_FILE@$KERNEL_ADDR"fi
meta-arm-bsp/recipes-devtools/fvp-common/files/start-foundation-armv8.sh +10
-0+# 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 ]; thenmeta-arm-bsp/recipes-devtools/fvp-common/files/start-foundation-armv8.sh +0
-0@@ -220,12 +230,6 @@ if [ -n "$DTB_FILE" ]; then --data=$DEPLOY_DIR_IMAGE/$DTB_FILE@$DTB_ADDR"fi
meta-arm-bsp/recipes-devtools/fvp-common/files/start-foundation-armv8.sh +0
-6-# 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 ]; thenFOUNDATION_PLAT_ARGS="$FOUNDATION_PLAT_ARGS \meta-arm-bsp/recipes-devtools/fvp-common/files/start-fvp-base.sh +1
-1@@ -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 filesBL1_FILE="bl1-fvp.bin"
meta-arm-bsp/recipes-devtools/fvp-common/files/start-fvp-base.sh +0
-0@@ -202,6 +202,16 @@ if [ -n "$KERNEL_FILE" ]; then --data cluster0.cpu0=$DEPLOY_DIR_IMAGE/$KERNEL_FILE@$KERNEL_ADDR"fi
meta-arm-bsp/recipes-devtools/fvp-common/files/start-fvp-base.sh +10
-0+# 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 ]; thenmeta-arm-bsp/recipes-devtools/fvp-common/files/start-fvp-base.sh +0
-0@@ -212,12 +222,6 @@ if [ -n "$DTB_FILE" ]; then --data cluster0.cpu0=$DEPLOY_DIR_IMAGE/$DTB_FILE@$DTB_ADDR"fi
meta-arm-bsp/recipes-devtools/fvp-common/files/start-fvp-base.sh +0
-6-# 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 ]; thenFVPARGS="$FVPARGS \--
2.17.1