diff options
| author | danh-arm <dan.handley@arm.com> | 2017-01-31 15:40:20 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-31 15:40:20 +0000 |
| commit | bcc2bf097703c07aabe543681ee2676981831f76 (patch) | |
| tree | 08f959e45d3c7441d747e0a854b4a069a0b82990 /lib/psci | |
| parent | 474d4eca1ca907968b04a4903d4adefaec4568e1 (diff) | |
| parent | 10bcd761574a5aaa208041382399e05275011603 (diff) | |
Merge pull request #821 from jeenu-arm/errata-printing
Errata printing infrastructure
Diffstat (limited to 'lib/psci')
| -rw-r--r-- | lib/psci/psci_lib.mk | 3 | ||||
| -rw-r--r-- | lib/psci/psci_setup.c | 6 |
2 files changed, 7 insertions, 2 deletions
diff --git a/lib/psci/psci_lib.mk b/lib/psci/psci_lib.mk index 8daa8318..82736cdd 100644 --- a/lib/psci/psci_lib.mk +++ b/lib/psci/psci_lib.mk @@ -1,5 +1,5 @@ # -# Copyright (c) 2016, ARM Limited and Contributors. All rights reserved. +# Copyright (c) 2016-2017, ARM Limited and Contributors. All rights reserved. # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are met: @@ -32,6 +32,7 @@ PSCI_LIB_SOURCES := lib/el3_runtime/cpu_data_array.c \ lib/el3_runtime/${ARCH}/cpu_data.S \ lib/el3_runtime/${ARCH}/context_mgmt.c \ lib/cpus/${ARCH}/cpu_helpers.S \ + lib/cpus/errata_report.c \ lib/locks/exclusive/${ARCH}/spinlock.S \ lib/psci/psci_off.c \ lib/psci/psci_on.c \ diff --git a/lib/psci/psci_setup.c b/lib/psci/psci_setup.c index cb8b77db..7327b92e 100644 --- a/lib/psci/psci_setup.c +++ b/lib/psci/psci_setup.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013-2016, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2013-2017, ARM Limited and Contributors. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: @@ -34,6 +34,7 @@ #include <bl_common.h> #include <context.h> #include <context_mgmt.h> +#include <errata_report.h> #include <platform.h> #include <stddef.h> #include "psci_private.h" @@ -287,6 +288,9 @@ void psci_arch_setup(void) /* Initialize the cpu_ops pointer. */ init_cpu_ops(); + + /* Having initialized cpu_ops, we can now print errata status */ + print_errata_status(); } /****************************************************************************** |