copy correct kernel to output dirsarmlt-16.10

The copy lists we copying the most recent kernel built to the output
directories, rather than copying the specific kernel needed for each
combination.

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

3 files changed, 14 insertions, 14 deletions

diff --git a/platforms/fvp/fvp b/platforms/fvp/fvp
index ab2c103..88b903b 100644
--- a/platforms/fvp/fvp
+++ b/platforms/fvp/fvp
@@ -71,7 +71,7 @@ TARGET_BINS_COPY_ENABLED=1
 #Busybox copies
 FVP_UBOOT_BUSYBOX_FOLDER=$PLATDIR/fvp-busybox/uboot
 index=${#TARGET_BINS_COPY_LIST_BUSYBOX[@]}
-TARGET_BINS_COPY_LIST_BUSYBOX[$[index++]]="${OUTDIR}/linux/Image ${FVP_UBOOT_BUSYBOX_FOLDER}/Image"
+TARGET_BINS_COPY_LIST_BUSYBOX[$[index++]]="${OUTDIR}/linux/Image.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"
 TARGET_BINS_COPY_LIST_BUSYBOX[$[index++]]="${OUTDIR}/fvp/tf-bl1.bin ${FVP_UBOOT_BUSYBOX_FOLDER}/bl1.bin"
@@ -81,7 +81,7 @@ TARGET_BINS_COPY_LIST_BUSYBOX[$[index++]]="${PLATDIR}/fvp/fip-uboot.bin ${FVP_UB
 #OE Copies
 FVP_UBOOT_OE_FOLDER=$PLATDIR/fvp-oe/uboot
 index=${#TARGET_BINS_COPY_LIST_OE[@]}
-TARGET_BINS_COPY_LIST_OE[$[index++]]="${OUTDIR}/linux/Image ${FVP_UBOOT_OE_FOLDER}/Image"
+TARGET_BINS_COPY_LIST_OE[$[index++]]="${OUTDIR}/linux/Image.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"
 TARGET_BINS_COPY_LIST_OE[$[index++]]="${OUTDIR}/fvp/tf-bl1.bin ${FVP_UBOOT_OE_FOLDER}/bl1.bin"
@@ -91,7 +91,7 @@ TARGET_BINS_COPY_LIST_OE[$[index++]]="${PLATDIR}/fvp/fip-uboot.bin ${FVP_UBOOT_O
 #Android Copies
 FVP_UBOOT_ANDROID_FOLDER=$PLATDIR/fvp-android/uboot
 index=${#TARGET_BINS_COPY_LIST_ANDROID[@]}
-TARGET_BINS_COPY_LIST_ANDROID[$[index++]]="${OUTDIR}/linux/Image ${FVP_UBOOT_ANDROID_FOLDER}/Image"
+TARGET_BINS_COPY_LIST_ANDROID[$[index++]]="${OUTDIR}/linux/Image.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"
 TARGET_BINS_COPY_LIST_ANDROID[$[index++]]="${OUTDIR}/fvp/tf-bl1.bin ${FVP_UBOOT_ANDROID_FOLDER}/bl1.bin"
diff --git a/platforms/juno/juno b/platforms/juno/juno
index 60c5fd4..e63ff2d 100644
--- a/platforms/juno/juno
+++ b/platforms/juno/juno
@@ -76,7 +76,7 @@ TARGET_BINS_COPY_ENABLED=1
 #Copy binaries into the U-Boot folder for busybox
 JUNO_UBOOT_BUSYBOX_FOLDER=$PLATDIR/juno-busybox/uboot
 index=${#TARGET_BINS_COPY_LIST_BUSYBOX[@]}
-TARGET_BINS_COPY_LIST_BUSYBOX[$[index++]]="${OUTDIR}/linux/Image ${JUNO_UBOOT_BUSYBOX_FOLDER}/Image"
+TARGET_BINS_COPY_LIST_BUSYBOX[$[index++]]="${OUTDIR}/linux/Image.mobile_bb ${JUNO_UBOOT_BUSYBOX_FOLDER}/Image"
 TARGET_BINS_COPY_LIST_BUSYBOX[$[index++]]="${OUTDIR}/linux/juno.dtb ${JUNO_UBOOT_BUSYBOX_FOLDER}/juno.dtb"
 TARGET_BINS_COPY_LIST_BUSYBOX[$[index++]]="${OUTDIR}/linux/juno-r1.dtb ${JUNO_UBOOT_BUSYBOX_FOLDER}/juno-r1.dtb"
 TARGET_BINS_COPY_LIST_BUSYBOX[$[index++]]="${OUTDIR}/linux/juno-r2.dtb ${JUNO_UBOOT_BUSYBOX_FOLDER}/juno-r2.dtb"
@@ -87,7 +87,7 @@ TARGET_BINS_COPY_LIST_BUSYBOX[$[index++]]="${PLATDIR}/uInitrd-busybox.0x84000000
 #Copy binaries into the U-Boot folder for oe
 JUNO_UBOOT_OE_FOLDER=$PLATDIR/juno-oe/uboot
 index=${#TARGET_BINS_COPY_LIST_OE[@]}
-TARGET_BINS_COPY_LIST_OE[$[index++]]="${OUTDIR}/linux/Image ${JUNO_UBOOT_OE_FOLDER}/Image"
+TARGET_BINS_COPY_LIST_OE[$[index++]]="${OUTDIR}/linux/Image.mobile_oe ${JUNO_UBOOT_OE_FOLDER}/Image"
 TARGET_BINS_COPY_LIST_OE[$[index++]]="${OUTDIR}/linux/juno.dtb ${JUNO_UBOOT_OE_FOLDER}/juno.dtb"
 TARGET_BINS_COPY_LIST_OE[$[index++]]="${OUTDIR}/linux/juno-r1.dtb ${JUNO_UBOOT_OE_FOLDER}/juno-r1.dtb"
 TARGET_BINS_COPY_LIST_OE[$[index++]]="${OUTDIR}/linux/juno-r2.dtb ${JUNO_UBOOT_OE_FOLDER}/juno-r2.dtb"
@@ -98,7 +98,7 @@ TARGET_BINS_COPY_LIST_OE[$[index++]]="${PLATDIR}/uInitrd-oe.0x84000000 ${JUNO_UB
 #Copy binaries into the U-Boot folder for android
 JUNO_UBOOT_ANDROID_FOLDER=$PLATDIR/juno-android/uboot
 index=${#TARGET_BINS_COPY_LIST_ANDROID[@]}
-TARGET_BINS_COPY_LIST_ANDROID[$[index++]]="${OUTDIR}/linux/Image ${JUNO_UBOOT_ANDROID_FOLDER}/Image"
+TARGET_BINS_COPY_LIST_ANDROID[$[index++]]="${OUTDIR}/linux/Image.android ${JUNO_UBOOT_ANDROID_FOLDER}/Image"
 TARGET_BINS_COPY_LIST_ANDROID[$[index++]]="${OUTDIR}/linux/juno.dtb ${JUNO_UBOOT_ANDROID_FOLDER}/juno.dtb"
 TARGET_BINS_COPY_LIST_ANDROID[$[index++]]="${OUTDIR}/linux/juno-r1.dtb ${JUNO_UBOOT_ANDROID_FOLDER}/juno-r1.dtb"
 TARGET_BINS_COPY_LIST_ANDROID[$[index++]]="${OUTDIR}/linux/juno-r2.dtb ${JUNO_UBOOT_ANDROID_FOLDER}/juno-r2.dtb"
@@ -117,7 +117,7 @@ TARGET_BINS_COPY_LIST_OE[$[oe_copy_index++]]="${TOP_DIR}/recovery/SOFTWARE/bl0.b
 TARGET_BINS_COPY_LIST_OE[$[oe_copy_index++]]="${OUTDIR}/juno/tf-bl1.bin ${firmware_folder}/SOFTWARE/bl1.bin"
 TARGET_BINS_COPY_LIST_OE[$[oe_copy_index++]]="${PLATDIR}/juno/fip-uefi.bin ${firmware_folder}/SOFTWARE/fip.bin"
 TARGET_BINS_COPY_LIST_OE[$[oe_copy_index++]]="${OUTDIR}/linux/*.dtb ${firmware_folder}/SOFTWARE/"
-TARGET_BINS_COPY_LIST_OE[$[oe_copy_index++]]="${OUTDIR}/linux/Image ${firmware_folder}/SOFTWARE/Image"
+TARGET_BINS_COPY_LIST_OE[$[oe_copy_index++]]="${OUTDIR}/linux/Image.mobile_oe ${firmware_folder}/SOFTWARE/Image"
 TARGET_BINS_COPY_LIST_OE[$[oe_copy_index++]]="${PLATDIR}/ramdisk-oe.img ${firmware_folder}/SOFTWARE/ramdisk.img"
 TARGET_BINS_EXTRA_TAR_LIST="$TARGET_BINS_EXTRA_TAR_LIST $firmware_folder"
 
@@ -129,7 +129,7 @@ TARGET_BINS_COPY_LIST_OE[$[oe_copy_index++]]="${TOP_DIR}/recovery/SOFTWARE/bl0.b
 TARGET_BINS_COPY_LIST_OE[$[oe_copy_index++]]="${OUTDIR}/juno/tf-bl1.bin ${firmware_folder}/SOFTWARE/bl1.bin"
 TARGET_BINS_COPY_LIST_OE[$[oe_copy_index++]]="${PLATDIR}/juno/fip-uboot.bin ${firmware_folder}/SOFTWARE/fip.bin"
 TARGET_BINS_COPY_LIST_OE[$[oe_copy_index++]]="${OUTDIR}/linux/*.dtb ${firmware_folder}/SOFTWARE/"
-TARGET_BINS_COPY_LIST_OE[$[oe_copy_index++]]="${OUTDIR}/linux/Image ${firmware_folder}/SOFTWARE/Image"
+TARGET_BINS_COPY_LIST_OE[$[oe_copy_index++]]="${OUTDIR}/linux/Image.mobile_oe ${firmware_folder}/SOFTWARE/Image"
 TARGET_BINS_COPY_LIST_OE[$[oe_copy_index++]]="${PLATDIR}/uInitrd-oe.0x84000000 ${firmware_folder}/SOFTWARE/ramdisk.img"
 TARGET_BINS_EXTRA_TAR_LIST="$TARGET_BINS_EXTRA_TAR_LIST $firmware_folder"
 
diff --git a/platforms/tc2/tc2 b/platforms/tc2/tc2
index aac1a9d..4efa4a7 100644
--- a/platforms/tc2/tc2
+++ b/platforms/tc2/tc2
@@ -89,13 +89,13 @@ TARGET_BINS_COPY_ENABLED=1
 #Busybox copies
 TC2_BB_BOOTMON_FOLDER=$PLATDIR/tc2-busybox/bootmon
 index=${#TARGET_BINS_COPY_LIST_BUSYBOX[@]}
-TARGET_BINS_COPY_LIST_BUSYBOX[$[index++]]="${OUTDIR}/linux/zImage ${TC2_BB_BOOTMON_FOLDER}/zImage"
+TARGET_BINS_COPY_LIST_BUSYBOX[$[index++]]="${OUTDIR}/linux/zImage.mobile_bb ${TC2_BB_BOOTMON_FOLDER}/zImage"
 TARGET_BINS_COPY_LIST_BUSYBOX[$[index++]]="${OUTDIR}/linux/vexpress-v2p-ca15_a7.dtb ${TC2_BB_BOOTMON_FOLDER}/tc2.dtb"
 TARGET_BINS_COPY_LIST_BUSYBOX[$[index++]]="${PLATDIR}/ramdisk-busybox.img ${TC2_BB_BOOTMON_FOLDER}/ramdisk.img"
 TARGET_BINS_COPY_LIST_BUSYBOX[$[index++]]="${TOP_DIR}/vexpress-firmware/SOFTWARE/bootkern.txt ${TC2_BB_BOOTMON_FOLDER}/bootscr.txt"
 if [ "$UBOOT_BUILD_ENABLED" == "1" ]; then
 	TC2_BB_UBOOT_FOLDER=$PLATDIR/tc2-busybox/uboot
-	TARGET_BINS_COPY_LIST_BUSYBOX[$[index++]]="${OUTDIR}/linux/uImage.0x80080000 ${TC2_BB_UBOOT_FOLDER}/Image"
+	TARGET_BINS_COPY_LIST_BUSYBOX[$[index++]]="${OUTDIR}/linux/uImage.0x80080000.mobile_bb ${TC2_BB_UBOOT_FOLDER}/Image"
 	TARGET_BINS_COPY_LIST_BUSYBOX[$[index++]]="${OUTDIR}/linux/vexpress-v2p-ca15_a7.dtb ${TC2_BB_UBOOT_FOLDER}/tc2.dtb"
 	TARGET_BINS_COPY_LIST_BUSYBOX[$[index++]]="${PLATDIR}/uInitrd-busybox.0x84000000 ${TC2_BB_UBOOT_FOLDER}/ramdisk.img"
 	TARGET_BINS_COPY_LIST_BUSYBOX[$[index++]]="${TOP_DIR}/vexpress-firmware/SOFTWARE/bootscr.txt ${TC2_BB_UBOOT_FOLDER}/bootscr.txt"
@@ -104,13 +104,13 @@ fi
 
 TC2_OE_BOOTMON_FOLDER=$PLATDIR/tc2-oe/bootmon
 index=${#TARGET_BINS_COPY_LIST_OE[@]}
-TARGET_BINS_COPY_LIST_OE[$[index++]]="${OUTDIR}/linux/zImage ${TC2_OE_BOOTMON_FOLDER}/Image"
+TARGET_BINS_COPY_LIST_OE[$[index++]]="${OUTDIR}/linux/zImage.mobile_oe ${TC2_OE_BOOTMON_FOLDER}/Image"
 TARGET_BINS_COPY_LIST_OE[$[index++]]="${OUTDIR}/linux/vexpress-v2p-ca15_a7.dtb ${TC2_OE_BOOTMON_FOLDER}/tc2.dtb"
 TARGET_BINS_COPY_LIST_OE[$[index++]]="${PLATDIR}/ramdisk-oe.img ${TC2_OE_BOOTMON_FOLDER}/ramdisk.img"
 TARGET_BINS_COPY_LIST_OE[$[index++]]="${TOP_DIR}/vexpress-firmware/SOFTWARE/bootkern.txt ${TC2_OE_BOOTMON_FOLDER}/bootscr.txt"
 if [ "$UBOOT_BUILD_ENABLED" == "1" ]; then
 	TC2_OE_UBOOT_FOLDER=$PLATDIR/tc2-oe/uboot
-	TARGET_BINS_COPY_LIST_OE[$[index++]]="${OUTDIR}/linux/uImage.0x80080000 ${TC2_OE_UBOOT_FOLDER}/Image"
+	TARGET_BINS_COPY_LIST_OE[$[index++]]="${OUTDIR}/linux/uImage.0x80080000.mobile_oe ${TC2_OE_UBOOT_FOLDER}/Image"
 	TARGET_BINS_COPY_LIST_OE[$[index++]]="${OUTDIR}/linux/vexpress-v2p-ca15_a7.dtb ${TC2_OE_UBOOT_FOLDER}/tc2.dtb"
 	TARGET_BINS_COPY_LIST_OE[$[index++]]="${PLATDIR}/uInitrd-oe.0x84000000 ${TC2_OE_UBOOT_FOLDER}/ramdisk.img"
 	TARGET_BINS_COPY_LIST_OE[$[index++]]="${TOP_DIR}/vexpress-firmware/SOFTWARE/bootscr.txt ${TC2_OE_UBOOT_FOLDER}/bootscr.txt"
@@ -119,13 +119,13 @@ fi
 
 TC2_BOOTMON_FOLDER=$PLATDIR/tc2-android/bootmon
 index=${#TARGET_BINS_COPY_LIST_ANDROID[@]}
-TARGET_BINS_COPY_LIST_ANDROID[$[index++]]="${OUTDIR}/linux/zImage ${TC2_BOOTMON_FOLDER}/Image"
+TARGET_BINS_COPY_LIST_ANDROID[$[index++]]="${OUTDIR}/linux/zImage.android ${TC2_BOOTMON_FOLDER}/Image"
 TARGET_BINS_COPY_LIST_ANDROID[$[index++]]="${OUTDIR}/linux/vexpress-v2p-ca15_a7.dtb ${TC2_BOOTMON_FOLDER}/tc2.dtb"
 TARGET_BINS_COPY_LIST_ANDROID[$[index++]]="${TOP_DIR}/prebuilts/android/tc2/ramdisk.img ${TC2_BOOTMON_FOLDER}/ramdisk.img"
 TARGET_BINS_COPY_LIST_ANDROID[$[index++]]="${TOP_DIR}/vexpress-firmware/SOFTWARE/bootkern.txt ${TC2_BOOTMON_FOLDER}/bootscr.txt"
 if [ "$UBOOT_BUILD_ENABLED" == "1" ]; then
 	TC2_ANDROID_UBOOT_FOLDER=$PLATDIR/tc2-android/uboot
-	TARGET_BINS_COPY_LIST_ANDROID[$[index++]]="${OUTDIR}/linux/uImage.0x80080000 ${TC2_ANDROID_UBOOT_FOLDER}/Image"
+	TARGET_BINS_COPY_LIST_ANDROID[$[index++]]="${OUTDIR}/linux/uImage.0x80080000.android ${TC2_ANDROID_UBOOT_FOLDER}/Image"
 	TARGET_BINS_COPY_LIST_ANDROID[$[index++]]="${OUTDIR}/linux/vexpress-v2p-ca15_a7.dtb ${TC2_ANDROID_UBOOT_FOLDER}/tc2.dtb"
 	TARGET_BINS_COPY_LIST_ANDROID[$[index++]]="${PLATDIR}/tc2-uInitrd-android.0x84000000 ${TC2_ANDROID_UBOOT_FOLDER}/ramdisk.img"
 	TARGET_BINS_COPY_LIST_ANDROID[$[index++]]="${TOP_DIR}/vexpress-firmware/SOFTWARE/bootscr.txt ${TC2_ANDROID_UBOOT_FOLDER}/bootscr.txt"