From af9acbb8c8f609f180665ce35317fad3f531395c Mon Sep 17 00:00:00 2001 From: Ryan Harkin Date: Thu, 8 Dec 2016 19:31:08 +0000 Subject: prepare fvp for fvp32 changes The main changes are: - don't build uImage.0x80080000 any more We don't use this on fvp anyway and fvp32 doesn't want it either. This also means we can ${LINUX_IMAGE_TYPE} for both platforms. - Use ${PLATFORM} in the copy lists instead of "fvp". This means fvp32 doesn't need to redefine the copy lists - Only output UEFI binaries UEFI build enabled fvp32 doesn't have a UEFI build yet, so the packaging stage would fail if we didn't exclude UEFI. - Remove the duplicate UBOOT_ lines from the bottom of the file Change-Id: I3d14272d667271fa879cd985e771a5344b1b8022 Signed-off-by: Ryan Harkin --- platforms/fvp/fvp | 40 ++++++++++++++++++++++------------------ 1 file changed, 22 insertions(+), 18 deletions(-) diff --git a/platforms/fvp/fvp b/platforms/fvp/fvp index b9fb3ce..766c53d 100644 --- a/platforms/fvp/fvp +++ b/platforms/fvp/fvp @@ -61,7 +61,7 @@ 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]="Image uImage.0x80080000" +TARGET_fvp[linux]="${LINUX_IMAGE_TYPE}" TARGET_fvp[ramdisk]=0x84000000 TARGET_fvp[output]=fvp @@ -69,42 +69,46 @@ TARGET_fvp[output]=fvp TARGET_BINS_COPY_ENABLED=1 #Busybox copies -FVP_UBOOT_BUSYBOX_FOLDER=$PLATDIR/fvp-busybox/uboot +FVP_UBOOT_BUSYBOX_FOLDER=$PLATDIR/${PLATFORM}-busybox/uboot index=${#TARGET_BINS_COPY_LIST_BUSYBOX[@]} -TARGET_BINS_COPY_LIST_BUSYBOX[$[index++]]="${OUTDIR}/linux/Image.mobile_bb ${FVP_UBOOT_BUSYBOX_FOLDER}/Image" +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/foundation-v8-gicv3-chosen.dtb ${FVP_UBOOT_BUSYBOX_FOLDER}/foundation-v8-gicv3.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/fvp-oe/uboot +FVP_UBOOT_OE_FOLDER=$PLATDIR/${PLATFORM}-oe/uboot index=${#TARGET_BINS_COPY_LIST_OE[@]} -TARGET_BINS_COPY_LIST_OE[$[index++]]="${OUTDIR}/linux/Image.mobile_oe ${FVP_UBOOT_OE_FOLDER}/Image" +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/foundation-v8-gicv3-chosen-oe.dtb ${FVP_UBOOT_OE_FOLDER}/foundation-v8-gicv3.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/fvp-android/uboot +FVP_UBOOT_ANDROID_FOLDER=$PLATDIR/${PLATFORM}-android/uboot index=${#TARGET_BINS_COPY_LIST_ANDROID[@]} -TARGET_BINS_COPY_LIST_ANDROID[$[index++]]="${OUTDIR}/linux/Image.android ${FVP_UBOOT_ANDROID_FOLDER}/Image" +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/foundation-v8-gicv3-chosen-android.dtb ${FVP_UBOOT_ANDROID_FOLDER}/foundation-v8-gicv3.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" - -FVP_UEFI_FOLDER=$PLATDIR/fvp-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" +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" - -UBOOT_BOARDS="vexpress_aemv8a_dram" -UBOOT_OUTPUT_DESTS[vexpress_aemv8a_dram]=fvp -- cgit v1.2.3