From f63763443d8f334dc741099abf03b39ff7abed54 Mon Sep 17 00:00:00 2001
From: Rahul Singh <rahul.singh@arm.com>
Date: Wed, 18 Mar 2020 11:49:34 +0000
Subject: [PATCH] Use xen dtb if xen image is present

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>
---
 .../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 1df4fd84..a1139989 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 ab60cea8..f391c23a 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 \