fvp_utils.sh: fix Cortex-A55x4+Cortex-A75|74 binary names

For some reason, A55 + A75 combo cortexs (and A65AEEx4 + A76AEx2) have
an infix 'Cortex', where the rest of combos does not have this
combination in the 'FVP ARM Standard Library Model [1]. Perhaps this
is worth a ticket in ARM but for the time being, fixing it at TF-A.

    $ ls -la | grep +Cortex
    -rwxrwxr-x 1 root root 11736056 Sep 18 22:18 FVP_Base_Cortex-A55+Cortex-A76
    -rwxrwxr-x 1 root root 11678712 Sep 18 22:18 FVP_Base_Cortex-A55x1+Cortex-A75x1
    -rwxrwxr-x 1 root root 11699192 Sep 18 22:18 FVP_Base_Cortex-A55x2+Cortex-A75x2
    -rwxrwxr-x 1 root root 11707384 Sep 18 22:18 FVP_Base_Cortex-A55x4+Cortex-A75x1
    -rwxrwxr-x 1 root root 11719672 Sep 18 22:18 FVP_Base_Cortex-A55x4+Cortex-A75x2
    -rwxrwxr-x 1 root root 11736056 Sep 18 22:18 FVP_Base_Cortex-A55x4+Cortex-A75x4
    -rwxrwxr-x 1 root root 11719672 Sep 18 22:18 FVP_Base_Cortex-A55x4+Cortex-A76x2
    -rwxrwxr-x 1 root root 11711480 Sep 18 22:18 FVP_Base_Cortex-A65AEx2+Cortex-A76AEx2
    -rwxrwxr-x 1 root root 11756536 Sep 18 22:18 FVP_Base_Cortex-A65AEx4+Cortex-A76AEx4

[1] https://silver.arm.com/download/download.tm?pv=4807217&p=3785926

Signed-off-by: Leonardo Sandoval <leonardo.sandoval@linaro.org>
Change-Id: Ib83bdf4d7475387a141abd498a9e9099bbb9a548
diff --git a/fvp_utils.sh b/fvp_utils.sh
index d11a03d..79a7286 100644
--- a/fvp_utils.sh
+++ b/fvp_utils.sh
@@ -60,8 +60,8 @@
 [cortex-a32x4]="${fvp_arm_std_library};FVP_Base_Cortex-A32x4"
 [cortex-a35x4]="${fvp_arm_std_library};FVP_Base_Cortex-A35x4"
 [cortex-a53x4]="${fvp_arm_std_library};FVP_Base_Cortex-A53x4"
-[cortex-a55x4-a75x4]="${fvp_arm_std_library};FVP_Base_Cortex-A55x4-A75x4"
-[cortex-a55x4-a76x2]="${fvp_arm_std_library};FVP_Base_Cortex-A55x4-A76x2"
+[cortex-a55x4-a75x4]="${fvp_arm_std_library};FVP_Base_Cortex-A55x4+Cortex-A75x4"
+[cortex-a55x4-a76x2]="${fvp_arm_std_library};FVP_Base_Cortex-A55x4+Cortex-A76x2"
 [cortex-a57x1-a53x1]="${fvp_arm_std_library};FVP_Base_Cortex-A57x1-A53x1"
 [cortex-a57x2-a53x4]="${fvp_arm_std_library};FVP_Base_Cortex-A57x2-A53x4"
 [cortex-a57x4]="${fvp_arm_std_library};FVP_Base_Cortex-A57x4"