aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Tsichritzis <john.tsichritzis@arm.com>2018-10-25 10:05:39 +0100
committerJoel Hutton <Joel.Hutton@Arm.com>2019-01-11 14:35:08 +0000
commite223699220a568c30f4926282b31a87d0b424270 (patch)
tree8efff470efcdc1ed52685278a205b8a03cbddf4a
parent0541db1e22f9e60ddfcfd663e67c4dc6e3625577 (diff)
downloadtf-a-tests-e223699220a568c30f4926282b31a87d0b424270.tar.gz
hikey960: Fake only 1 core
hikey960 has an unresolved power management bug, so for now we can only run single core tests. The bug report can be found here: https://bugs.96boards.org/show_bug.cgi?id=783 Change-Id: I206fafd7677428f81f48d1c7c1d419402149bd37 Co-authored-by: John Tsichritzis <john.tsichritzis@arm.com> Co-authored-by: Joel Hutton <Joel.Hutton@Arm.com> Signed-off-by: Joel Hutton <Joel.Hutton@Arm.com>
-rw-r--r--plat/hisilicon/hikey960/hikey960_setup.c9
-rw-r--r--plat/hisilicon/hikey960/include/platform_def.h10
-rw-r--r--plat/hisilicon/hikey960/platform.mk2
3 files changed, 16 insertions, 5 deletions
diff --git a/plat/hisilicon/hikey960/hikey960_setup.c b/plat/hisilicon/hikey960/hikey960_setup.c
index 7d6e0d97..55f8b8eb 100644
--- a/plat/hisilicon/hikey960/hikey960_setup.c
+++ b/plat/hisilicon/hikey960/hikey960_setup.c
@@ -28,9 +28,14 @@ const unsigned char hikey960_power_domain_tree_desc[] = {
/* Number of clusters */
PLATFORM_CLUSTER_COUNT,
/* Number of children for the first cluster node */
- PLATFORM_CORE_COUNT_PER_CLUSTER,
+ PLATFORM_CORE_COUNT_PER_CLUSTER
+ /*
+ * TODO: Re-enable this code once power management issues on Hikey [1]
+ * are resolved.
+ * [1] https://bugs.96boards.org/show_bug.cgi?id=783
+ */
/* Number of children for the second cluster node */
- PLATFORM_CORE_COUNT_PER_CLUSTER,
+ /* PLATFORM_CORE_COUNT_PER_CLUSTER, */
};
diff --git a/plat/hisilicon/hikey960/include/platform_def.h b/plat/hisilicon/hikey960/include/platform_def.h
index fcdd3341..e3e878fd 100644
--- a/plat/hisilicon/hikey960/include/platform_def.h
+++ b/plat/hisilicon/hikey960/include/platform_def.h
@@ -18,9 +18,13 @@
#define CACHE_WRITEBACK_GRANULE 0x40
-
-#define PLATFORM_CLUSTER_COUNT 2
-#define PLATFORM_CORE_COUNT_PER_CLUSTER 4
+/*
+ * hikey960 has an unresolved power management bug, so for now we can only
+ * run single core tests.
+ * TODO:Update these values when power management bug is resolved
+ */
+#define PLATFORM_CLUSTER_COUNT 1
+#define PLATFORM_CORE_COUNT_PER_CLUSTER 1
#define PLATFORM_CORE_COUNT (PLATFORM_CLUSTER_COUNT * \
PLATFORM_CORE_COUNT_PER_CLUSTER)
#define PLATFORM_NUM_AFFS (PLATFORM_CORE_COUNT + \
diff --git a/plat/hisilicon/hikey960/platform.mk b/plat/hisilicon/hikey960/platform.mk
index 9765a9ff..4bc1626a 100644
--- a/plat/hisilicon/hikey960/platform.mk
+++ b/plat/hisilicon/hikey960/platform.mk
@@ -19,6 +19,8 @@ PLAT_SOURCES := ${HIKEY960_PATH}/hikey960_setup.c \
drivers/arm/timer/private_timer.c \
plat/arm/common/arm_timers.c
+TFTF_CFLAGS += -Wno-maybe-uninitialized
+
ifeq ($(USE_NVM),1)
$(error "Hikey960 port of TFTF doesn't currently support USE_NVM=1")
endif