Merge "Creating separate xml for Reboot tests"
diff --git a/plat/arm/juno/juno64_tests_to_skip.txt b/plat/arm/juno/juno64_tests_to_skip.txt
new file mode 100644
index 0000000..9ce8cce
--- /dev/null
+++ b/plat/arm/juno/juno64_tests_to_skip.txt
@@ -0,0 +1,8 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
+# The multicore spurious interrupt test is known to cause problems on Juno
+IRQ support in TSP/Multicore spurious interrupt test
diff --git a/plat/arm/juno/platform.mk b/plat/arm/juno/platform.mk
index 9c92536..d788177 100644
--- a/plat/arm/juno/platform.mk
+++ b/plat/arm/juno/platform.mk
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2018, Arm Limited. All rights reserved.
+# Copyright (c) 2018-2019, Arm Limited. All rights reserved.
#
# SPDX-License-Identifier: BSD-3-Clause
#
@@ -18,9 +18,11 @@
plat/arm/juno/juno_mem_prot.c \
plat/arm/juno/plat_setup.c
-# Some tests are not supported on Juno AArch32.
ifeq (${ARCH},aarch32)
-PLAT_TESTS_SKIP_LIST := plat/arm/juno/juno32_tests_to_skip.txt
+# Some tests are not supported on Juno AArch32.
+ PLAT_TESTS_SKIP_LIST := plat/arm/juno/juno32_tests_to_skip.txt
+else
+ PLAT_TESTS_SKIP_LIST := plat/arm/juno/juno64_tests_to_skip.txt
endif
PLAT_SUPPORTS_NS_RESET := 1
diff --git a/plat/common/plat_topology.c b/plat/common/plat_topology.c
index 01e3461..33b6e57 100644
--- a/plat/common/plat_topology.c
+++ b/plat/common/plat_topology.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, Arm Limited. All rights reserved.
+ * Copyright (c) 2018-2019, Arm Limited. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
@@ -86,7 +86,8 @@
node_idx = tftf_pwr_domain_start_idx[aff_lvl];
- while (tftf_pd_nodes[node_idx].level == aff_lvl) {
+ while ((node_idx < PLATFORM_NUM_AFFS) &&
+ (tftf_pd_nodes[node_idx].level == aff_lvl)) {
if (tftf_pd_nodes[node_idx].is_present)
count++;
node_idx++;