aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan Harkin <ryan.harkin@linaro.org>2017-08-09 15:48:40 +0100
committerRyan Harkin <ryan.harkin@linaro.org>2017-08-09 16:07:17 +0100
commit72868d7f1b3cd5cec8e67125a5597545f61b83d1 (patch)
treed18afb92ac566caa325a72d389a52d3916a68f8b
parentb6b3df0c29274104f63559028e509200f9430586 (diff)
Add Linux DTS for FVP with threaded CPUsarmlt-20170810-001armlt-20170809-00117.07
In contrast with the non-multi-threading DTS, this enumerates MPIDR values shifted by one affinity level to the left. The newly added DTS reflects CPUs with a single thread in them. Since both DTS files are the same apart from MPIDR contents, the common bits have been moved to a separate file that's then included from the top-level DTS files. The multi-threading version only updates the MPIDR contents. Change-Id: I9df71daa9c6fe7f658ba1d2c9d30a82154be8d7d Signed-off-by: Ryan Harkin <ryan.harkin@linaro.org>
-rw-r--r--platforms/common/common.fvp5
-rw-r--r--platforms/fvp32/fvp322
2 files changed, 5 insertions, 2 deletions
diff --git a/platforms/common/common.fvp b/platforms/common/common.fvp
index bfd7c58..5691df4 100644
--- a/platforms/common/common.fvp
+++ b/platforms/common/common.fvp
@@ -60,7 +60,7 @@ 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[fdts]="fvp-base-aemv8a-aemv8a fvp-base-aemv8a-aemv8a-t1 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
@@ -73,6 +73,7 @@ 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"
+TARGET_BINS_COPY_LIST_BUSYBOX[$[index++]]="${OUTDIR}/linux/fvp-base-aemv8a-aemv8a-t1-chosen.dtb ${FVP_UBOOT_BUSYBOX_FOLDER}/fvp-base-aemv8a-aemv8a-t1.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
@@ -85,6 +86,7 @@ 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"
+TARGET_BINS_COPY_LIST_OE[$[index++]]="${OUTDIR}/linux/fvp-base-aemv8a-aemv8a-t1-chosen-oe.dtb ${FVP_UBOOT_OE_FOLDER}/fvp-base-aemv8a-aemv8a-t1.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
@@ -97,6 +99,7 @@ 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"
+TARGET_BINS_COPY_LIST_ANDROID[$[index++]]="${OUTDIR}/linux/fvp-base-aemv8a-aemv8a-t1-chosen-android.dtb ${FVP_UBOOT_ANDROID_FOLDER}/fvp-base-aemv8a-aemv8a-t1.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
diff --git a/platforms/fvp32/fvp32 b/platforms/fvp32/fvp32
index 569701d..17b90ec 100644
--- a/platforms/fvp32/fvp32
+++ b/platforms/fvp32/fvp32
@@ -50,4 +50,4 @@ OPTEE_BUILD_ENABLED=0
ARM_TF_BUILD_FLAGS="AARCH32_SP=sp_min"
ARM_TF_ARCH=aarch32
ARM_TF_DEBUG_ENABLED=0
-TARGET_fvp[fdts]="fvp-base-aemv8a-aemv8a"
+TARGET_fvp[fdts]="fvp-base-aemv8a-aemv8a fvp-base-aemv8a-aemv8a-t1"