Create common.fvp to share between fvp and fvp32armlt-20161212-001

THe workspace sync script provided by PEG deletes the platforms not used
by the user.

Therefore, we need to keep the file included from fvp32 or it will
break.

To do this, make a new common file, platforms/common/common.fvp and
include it from both the fvp and fvp32 platform configs.

Change-Id: Ie8f951a19733c19bfed53f6e8860566884f683ce
Signed-off-by: Ryan Harkin <ryan.harkin@linaro.org>

3 files changed, 116 insertions, 87 deletions

diff --git a/platforms/common/common.fvp b/platforms/common/common.fvp
new file mode 100644
index 0000000..766c53d
--- /dev/null
+++ b/platforms/common/common.fvp
@@ -0,0 +1,114 @@
+# Copyright (c) 2015, ARM Limited and Contributors. All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# Redistributions of source code must retain the above copyright notice, this
+# list of conditions and the following disclaimer.
+#
+# Redistributions in binary form must reproduce the above copyright notice,
+# this list of conditions and the following disclaimer in the documentation
+# and/or other materials provided with the distribution.
+#
+# Neither the name of ARM nor the names of its contributors may be used
+# to endorse or promote products derived from this software without specific
+# prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+
+#Android options
+ANDROID_BINS_VARIANTS_PLAT="fvp"
+ANDROID_SOURCE_VARIANT=$ANDROID_BINS_VARIANTS_PLAT
+ANDROID_LUNCH_TARGET_PREBUILT="fvp-userdebug"
+ANDROID_LUNCH_TARGET_SRC="fvp-userdebug"
+
+VARIANT_DESC="FVP kernel for BusyBox Software Stack"
+source $DIR/platforms/common/common.base
+
+UBOOT_BOARDS="vexpress_aemv8a_dram"
+UBOOT_OUTPUT_DESTS[vexpress_aemv8a_dram]=fvp
+
+UEFI_PLATFORMS="fvp"
+declare -A UEFI_PLAT_fvp
+UEFI_PLAT_fvp[platname]="ArmVExpress-FVP-AArch64"
+UEFI_PLAT_fvp[output]=fvp
+UEFI_PLAT_fvp[defines]=
+UEFI_PLAT_fvp[binary]="FVP_AARCH64_EFI.fd"
+
+OPTEE_BUILD_ENABLED=1
+OPTEE_FLAVOUR="fvp"
+
+ARM_TF_PLATS="fvp"
+
+ANDROID_BINS_VARIANTS="fvp"
+
+TARGET_BINS_HAS_DTB_RAMDISK=1
+
+TARGET_BINS_PLATS="fvp"
+declare -A TARGET_fvp
+TARGET_fvp[arm-tf]="fvp"
+TARGET_fvp[scp]=""
+TARGET_fvp[uboot]="fvp"
+TARGET_fvp[uefi]="fvp"
+TARGET_fvp[fdts]="fvp-base-aemv8a-aemv8a foundation-v8-gicv3 fvp-base-gicv2-psci fvp-foundation-gicv2-psci"
+TARGET_fvp[linux]="${LINUX_IMAGE_TYPE}"
+TARGET_fvp[ramdisk]=0x84000000
+TARGET_fvp[output]=fvp
+
+#Copy binaries into the U-Boot folder
+TARGET_BINS_COPY_ENABLED=1
+
+#Busybox copies
+FVP_UBOOT_BUSYBOX_FOLDER=$PLATDIR/${PLATFORM}-busybox/uboot
+index=${#TARGET_BINS_COPY_LIST_BUSYBOX[@]}
+TARGET_BINS_COPY_LIST_BUSYBOX[$[index++]]="${OUTDIR}/linux/${LINUX_IMAGE_TYPE}.mobile_bb ${FVP_UBOOT_BUSYBOX_FOLDER}/Image"
+TARGET_BINS_COPY_LIST_BUSYBOX[$[index++]]="${OUTDIR}/linux/fvp-base-aemv8a-aemv8a-chosen.dtb ${FVP_UBOOT_BUSYBOX_FOLDER}/fvp-base-aemv8a-aemv8a.dtb"
+if [ "$PLATFORM" == "fvp" ]; then
+	TARGET_BINS_COPY_LIST_BUSYBOX[$[index++]]="${OUTDIR}/linux/foundation-v8-gicv3-chosen.dtb ${FVP_UBOOT_BUSYBOX_FOLDER}/foundation-v8-gicv3.dtb"
+fi
+TARGET_BINS_COPY_LIST_BUSYBOX[$[index++]]="${OUTDIR}/fvp/tf-bl1.bin ${FVP_UBOOT_BUSYBOX_FOLDER}/bl1.bin"
+TARGET_BINS_COPY_LIST_BUSYBOX[$[index++]]="${PLATDIR}/uInitrd-busybox.0x84000000 ${FVP_UBOOT_BUSYBOX_FOLDER}/ramdisk.img"
+TARGET_BINS_COPY_LIST_BUSYBOX[$[index++]]="${PLATDIR}/fvp/fip-uboot.bin ${FVP_UBOOT_BUSYBOX_FOLDER}/fip.bin"
+
+#OE Copies
+FVP_UBOOT_OE_FOLDER=$PLATDIR/${PLATFORM}-oe/uboot
+index=${#TARGET_BINS_COPY_LIST_OE[@]}
+TARGET_BINS_COPY_LIST_OE[$[index++]]="${OUTDIR}/linux/${LINUX_IMAGE_TYPE}.mobile_oe ${FVP_UBOOT_OE_FOLDER}/Image"
+TARGET_BINS_COPY_LIST_OE[$[index++]]="${OUTDIR}/linux/fvp-base-aemv8a-aemv8a-chosen-oe.dtb ${FVP_UBOOT_OE_FOLDER}/fvp-base-aemv8a-aemv8a.dtb"
+if [ "$PLATFORM" == "fvp" ]; then
+	TARGET_BINS_COPY_LIST_OE[$[index++]]="${OUTDIR}/linux/foundation-v8-gicv3-chosen-oe.dtb ${FVP_UBOOT_OE_FOLDER}/foundation-v8-gicv3.dtb"
+fi
+TARGET_BINS_COPY_LIST_OE[$[index++]]="${OUTDIR}/fvp/tf-bl1.bin ${FVP_UBOOT_OE_FOLDER}/bl1.bin"
+TARGET_BINS_COPY_LIST_OE[$[index++]]="${PLATDIR}/uInitrd-oe.0x84000000 ${FVP_UBOOT_OE_FOLDER}/ramdisk.img"
+TARGET_BINS_COPY_LIST_OE[$[index++]]="${PLATDIR}/fvp/fip-uboot.bin ${FVP_UBOOT_OE_FOLDER}/fip.bin"
+
+#Android Copies
+FVP_UBOOT_ANDROID_FOLDER=$PLATDIR/${PLATFORM}-android/uboot
+index=${#TARGET_BINS_COPY_LIST_ANDROID[@]}
+TARGET_BINS_COPY_LIST_ANDROID[$[index++]]="${OUTDIR}/linux/${LINUX_IMAGE_TYPE}.android ${FVP_UBOOT_ANDROID_FOLDER}/Image"
+TARGET_BINS_COPY_LIST_ANDROID[$[index++]]="${OUTDIR}/linux/fvp-base-aemv8a-aemv8a-chosen-android.dtb ${FVP_UBOOT_ANDROID_FOLDER}/fvp-base-aemv8a-aemv8a.dtb"
+if [ "$PLATFORM" == "fvp" ]; then
+	TARGET_BINS_COPY_LIST_ANDROID[$[index++]]="${OUTDIR}/linux/foundation-v8-gicv3-chosen-android.dtb ${FVP_UBOOT_ANDROID_FOLDER}/foundation-v8-gicv3.dtb"
+fi
+TARGET_BINS_COPY_LIST_ANDROID[$[index++]]="${OUTDIR}/fvp/tf-bl1.bin ${FVP_UBOOT_ANDROID_FOLDER}/bl1.bin"
+TARGET_BINS_COPY_LIST_ANDROID[$[index++]]="${PLATDIR}/fvp-uInitrd-android.0x84000000 ${FVP_UBOOT_ANDROID_FOLDER}/ramdisk.img"
+TARGET_BINS_COPY_LIST_ANDROID[$[index++]]="${PLATDIR}/fvp/fip-uboot.bin ${FVP_UBOOT_ANDROID_FOLDER}/fip.bin"
+
+if [[ $UEFI_BUILD_ENABLED == 1 ]]; then
+	FVP_UEFI_FOLDER=$PLATDIR/${PLATFORM}-uefi/uefi
+	index=${#TARGET_BINS_COPY_LIST_UEFI[@]}
+	TARGET_BINS_COPY_LIST_UEFI[$[index++]]="${OUTDIR}/fvp/tf-bl1.bin ${FVP_UEFI_FOLDER}/bl1.bin"
+	TARGET_BINS_COPY_LIST_UEFI[$[index++]]="${PLATDIR}/fvp/fip-uefi.bin ${FVP_UEFI_FOLDER}/fip.bin"
+fi
+
+FLAVOUR_BUILD_SCRIPTS="build-uboot.sh build-uefi.sh build-linux.sh build-devtrees.sh build-scp.sh build-arm-tf.sh build-optee-os.sh build-target-bins.sh build-android.sh"
diff --git a/platforms/fvp/fvp b/platforms/fvp/fvp
index 766c53d..e450567 100644
--- a/platforms/fvp/fvp
+++ b/platforms/fvp/fvp
@@ -26,89 +26,4 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-#Android options
-ANDROID_BINS_VARIANTS_PLAT="fvp"
-ANDROID_SOURCE_VARIANT=$ANDROID_BINS_VARIANTS_PLAT
-ANDROID_LUNCH_TARGET_PREBUILT="fvp-userdebug"
-ANDROID_LUNCH_TARGET_SRC="fvp-userdebug"
-
-VARIANT_DESC="FVP kernel for BusyBox Software Stack"
-source $DIR/platforms/common/common.base
-
-UBOOT_BOARDS="vexpress_aemv8a_dram"
-UBOOT_OUTPUT_DESTS[vexpress_aemv8a_dram]=fvp
-
-UEFI_PLATFORMS="fvp"
-declare -A UEFI_PLAT_fvp
-UEFI_PLAT_fvp[platname]="ArmVExpress-FVP-AArch64"
-UEFI_PLAT_fvp[output]=fvp
-UEFI_PLAT_fvp[defines]=
-UEFI_PLAT_fvp[binary]="FVP_AARCH64_EFI.fd"
-
-OPTEE_BUILD_ENABLED=1
-OPTEE_FLAVOUR="fvp"
-
-ARM_TF_PLATS="fvp"
-
-ANDROID_BINS_VARIANTS="fvp"
-
-TARGET_BINS_HAS_DTB_RAMDISK=1
-
-TARGET_BINS_PLATS="fvp"
-declare -A TARGET_fvp
-TARGET_fvp[arm-tf]="fvp"
-TARGET_fvp[scp]=""
-TARGET_fvp[uboot]="fvp"
-TARGET_fvp[uefi]="fvp"
-TARGET_fvp[fdts]="fvp-base-aemv8a-aemv8a foundation-v8-gicv3 fvp-base-gicv2-psci fvp-foundation-gicv2-psci"
-TARGET_fvp[linux]="${LINUX_IMAGE_TYPE}"
-TARGET_fvp[ramdisk]=0x84000000
-TARGET_fvp[output]=fvp
-
-#Copy binaries into the U-Boot folder
-TARGET_BINS_COPY_ENABLED=1
-
-#Busybox copies
-FVP_UBOOT_BUSYBOX_FOLDER=$PLATDIR/${PLATFORM}-busybox/uboot
-index=${#TARGET_BINS_COPY_LIST_BUSYBOX[@]}
-TARGET_BINS_COPY_LIST_BUSYBOX[$[index++]]="${OUTDIR}/linux/${LINUX_IMAGE_TYPE}.mobile_bb ${FVP_UBOOT_BUSYBOX_FOLDER}/Image"
-TARGET_BINS_COPY_LIST_BUSYBOX[$[index++]]="${OUTDIR}/linux/fvp-base-aemv8a-aemv8a-chosen.dtb ${FVP_UBOOT_BUSYBOX_FOLDER}/fvp-base-aemv8a-aemv8a.dtb"
-if [ "$PLATFORM" == "fvp" ]; then
-	TARGET_BINS_COPY_LIST_BUSYBOX[$[index++]]="${OUTDIR}/linux/foundation-v8-gicv3-chosen.dtb ${FVP_UBOOT_BUSYBOX_FOLDER}/foundation-v8-gicv3.dtb"
-fi
-TARGET_BINS_COPY_LIST_BUSYBOX[$[index++]]="${OUTDIR}/fvp/tf-bl1.bin ${FVP_UBOOT_BUSYBOX_FOLDER}/bl1.bin"
-TARGET_BINS_COPY_LIST_BUSYBOX[$[index++]]="${PLATDIR}/uInitrd-busybox.0x84000000 ${FVP_UBOOT_BUSYBOX_FOLDER}/ramdisk.img"
-TARGET_BINS_COPY_LIST_BUSYBOX[$[index++]]="${PLATDIR}/fvp/fip-uboot.bin ${FVP_UBOOT_BUSYBOX_FOLDER}/fip.bin"
-
-#OE Copies
-FVP_UBOOT_OE_FOLDER=$PLATDIR/${PLATFORM}-oe/uboot
-index=${#TARGET_BINS_COPY_LIST_OE[@]}
-TARGET_BINS_COPY_LIST_OE[$[index++]]="${OUTDIR}/linux/${LINUX_IMAGE_TYPE}.mobile_oe ${FVP_UBOOT_OE_FOLDER}/Image"
-TARGET_BINS_COPY_LIST_OE[$[index++]]="${OUTDIR}/linux/fvp-base-aemv8a-aemv8a-chosen-oe.dtb ${FVP_UBOOT_OE_FOLDER}/fvp-base-aemv8a-aemv8a.dtb"
-if [ "$PLATFORM" == "fvp" ]; then
-	TARGET_BINS_COPY_LIST_OE[$[index++]]="${OUTDIR}/linux/foundation-v8-gicv3-chosen-oe.dtb ${FVP_UBOOT_OE_FOLDER}/foundation-v8-gicv3.dtb"
-fi
-TARGET_BINS_COPY_LIST_OE[$[index++]]="${OUTDIR}/fvp/tf-bl1.bin ${FVP_UBOOT_OE_FOLDER}/bl1.bin"
-TARGET_BINS_COPY_LIST_OE[$[index++]]="${PLATDIR}/uInitrd-oe.0x84000000 ${FVP_UBOOT_OE_FOLDER}/ramdisk.img"
-TARGET_BINS_COPY_LIST_OE[$[index++]]="${PLATDIR}/fvp/fip-uboot.bin ${FVP_UBOOT_OE_FOLDER}/fip.bin"
-
-#Android Copies
-FVP_UBOOT_ANDROID_FOLDER=$PLATDIR/${PLATFORM}-android/uboot
-index=${#TARGET_BINS_COPY_LIST_ANDROID[@]}
-TARGET_BINS_COPY_LIST_ANDROID[$[index++]]="${OUTDIR}/linux/${LINUX_IMAGE_TYPE}.android ${FVP_UBOOT_ANDROID_FOLDER}/Image"
-TARGET_BINS_COPY_LIST_ANDROID[$[index++]]="${OUTDIR}/linux/fvp-base-aemv8a-aemv8a-chosen-android.dtb ${FVP_UBOOT_ANDROID_FOLDER}/fvp-base-aemv8a-aemv8a.dtb"
-if [ "$PLATFORM" == "fvp" ]; then
-	TARGET_BINS_COPY_LIST_ANDROID[$[index++]]="${OUTDIR}/linux/foundation-v8-gicv3-chosen-android.dtb ${FVP_UBOOT_ANDROID_FOLDER}/foundation-v8-gicv3.dtb"
-fi
-TARGET_BINS_COPY_LIST_ANDROID[$[index++]]="${OUTDIR}/fvp/tf-bl1.bin ${FVP_UBOOT_ANDROID_FOLDER}/bl1.bin"
-TARGET_BINS_COPY_LIST_ANDROID[$[index++]]="${PLATDIR}/fvp-uInitrd-android.0x84000000 ${FVP_UBOOT_ANDROID_FOLDER}/ramdisk.img"
-TARGET_BINS_COPY_LIST_ANDROID[$[index++]]="${PLATDIR}/fvp/fip-uboot.bin ${FVP_UBOOT_ANDROID_FOLDER}/fip.bin"
-
-if [[ $UEFI_BUILD_ENABLED == 1 ]]; then
-	FVP_UEFI_FOLDER=$PLATDIR/${PLATFORM}-uefi/uefi
-	index=${#TARGET_BINS_COPY_LIST_UEFI[@]}
-	TARGET_BINS_COPY_LIST_UEFI[$[index++]]="${OUTDIR}/fvp/tf-bl1.bin ${FVP_UEFI_FOLDER}/bl1.bin"
-	TARGET_BINS_COPY_LIST_UEFI[$[index++]]="${PLATDIR}/fvp/fip-uefi.bin ${FVP_UEFI_FOLDER}/fip.bin"
-fi
-
-FLAVOUR_BUILD_SCRIPTS="build-uboot.sh build-uefi.sh build-linux.sh build-devtrees.sh build-scp.sh build-arm-tf.sh build-optee-os.sh build-target-bins.sh build-android.sh"
+source ${DIR}/platforms/common/common.fvp
diff --git a/platforms/fvp32/fvp32 b/platforms/fvp32/fvp32
index 1786b80..569701d 100644
--- a/platforms/fvp32/fvp32
+++ b/platforms/fvp32/fvp32
@@ -31,7 +31,7 @@ LINUX_IMAGE_TYPE=zImage
 UEFI_BUILD_ENABLED=0
 
 # fvp32 is mostly fvp with some tweaks, so include it
-source ${DIR}/platforms/fvp/fvp
+source ${DIR}/platforms/common/common.fvp
 
 # over-ride some things from fvp that are specific to fvp32
 export CROSS_COMPILE=${CROSS_COMPILE_32}