Remove dependencies from FVP to generic code
Some generic parts of TFTF have dependencies from FVP platform
macros which can cause some trouble when porting the tests to a
different platform.
Signed-off-by: Javier Almansa Sobrino <javier.almansasobrino@arm.com>
Change-Id: I11eb1af142b8c0ee1de2fcc8f298658bceedf306
diff --git a/include/lib/tftf_lib.h b/include/lib/tftf_lib.h
index c3ad105..f9d1a6e 100644
--- a/include/lib/tftf_lib.h
+++ b/include/lib/tftf_lib.h
@@ -208,7 +208,7 @@
unsigned int tftf_is_rebooted(void);
static inline unsigned int make_mpid(unsigned int clusterid,
-#if FVP_MAX_PE_PER_CPU > 1
+#if PLAT_MAX_PE_PER_CPU > 1
unsigned int coreid,
unsigned int threadid)
#else
@@ -221,7 +221,7 @@
*/
if ((read_mpidr_el1() & MPIDR_MT_MASK) != 0)
return MPIDR_MT_MASK |
-#if FVP_MAX_PE_PER_CPU > 1
+#if PLAT_MAX_PE_PER_CPU > 1
((threadid & MPIDR_AFFLVL_MASK) << MPIDR_AFF0_SHIFT) |
#endif
((coreid & MPIDR_AFFLVL_MASK) << MPIDR_AFF1_SHIFT) |