mirrors/meta-arm
1
0
Fork 0
mirror of https://git.yoctoproject.org/meta-arm synced 2026-06-05 02:20:30 +00:00
Code Issues Projects Releases Wiki Activity

Use xen dtb if xen image is present

Browse Source 
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>
Reviewed-by: Bertrand Marquis <bertrand.marquis@arm.com>
Signed-off-by: Jon Mason <jon.mason@arm.com>
This commit is contained in:
Rahul Singh
2020-03-18 11:49:34 +00:00
committed by Jon Mason
parent 42541f9f39
commit f63763443d
2 changed files with 22 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-arm-bsp/recipes-devtools/fvp-common/files/start-foundation-armv8.sh
+11 -7
View File
@@ -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
View File
@@ -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 \