FVP: Update FVP version for upcoming release

Moving from 11.12.38 to 11.14.21 FVP versioning, which also requires
altering path to model slightly for most FVP references.

Signed-off-by: Lauren Wehrmeister <lauren.wehrmeister@arm.com>
Change-Id: Ib3a3eccdc54aa3d758920b9d3e9cc6355d1593d5
diff --git a/run_config/fvp-aemv8a.8_5+bti b/run_config/fvp-aemv8a.8_5+bti
index 51e02f1..57efcad 100644
--- a/run_config/fvp-aemv8a.8_5+bti
+++ b/run_config/fvp-aemv8a.8_5+bti
@@ -12,6 +12,6 @@
 		gen_model_params
 
 	model="base-aemv8a" \
-	model_bin="FVP_Base_RevC-2xAEMv8A" \
+	model_bin="FVP_Base_RevC-2xAEMvA" \
 	       gen_fvp_yaml
 }
diff --git a/run_config/fvp-aemv8a.8_6 b/run_config/fvp-aemv8a.8_6
index 40b92d2..d610f02 100644
--- a/run_config/fvp-aemv8a.8_6
+++ b/run_config/fvp-aemv8a.8_6
@@ -11,6 +11,6 @@
 		gen_model_params
 
 	model="base-aemv8a" \
-	model_bin="FVP_Base_RevC-2xAEMv8A" \
+	model_bin="FVP_Base_RevC-2xAEMvA" \
 	       gen_fvp_yaml
 }
diff --git a/run_config/fvp-aemv8a.aarch32.8_6 b/run_config/fvp-aemv8a.aarch32.8_6
index de39a3c..9fef38a 100644
--- a/run_config/fvp-aemv8a.aarch32.8_6
+++ b/run_config/fvp-aemv8a.aarch32.8_6
@@ -12,6 +12,6 @@
 	gen_model_params
 
 	model="base-aemv8a" \
-	model_bin="FVP_Base_RevC-2xAEMv8A" \
+	model_bin="FVP_Base_RevC-2xAEMvA" \
 	       gen_fvp_yaml
 }
diff --git a/run_config/fvp-morello b/run_config/fvp-morello
index b52088d..51f3341 100644
--- a/run_config/fvp-morello
+++ b/run_config/fvp-morello
@@ -16,7 +16,7 @@
 
 	model="morello" \
 	model_version="0.10" \
-	model_build="481" \
+	model_build="542" \
 	gen_model_params
 	set_run_env "ports_script" "$ci_root/model/morello-ports.awk"
 	set_run_env "num_uarts" "3"