diff options
| author | danh-arm <dan.handley@arm.com> | 2016-07-25 12:29:52 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-25 12:29:52 +0100 |
| commit | 3dd9835f8ab3c2e7f57ddc92505d6c800bbacd47 (patch) | |
| tree | cbecea4cf95d12d01493f2241e846b02dc536f8c /bl31/bl31_main.c | |
| parent | bc469a84b5541bc717bc04712df73f4001847215 (diff) | |
| parent | 738b1fd7c0628e9c6cc89e36629f27bde01559df (diff) | |
Merge pull request #667 from soby-mathew/sm/PSCI_lib
Introduce PSCI library
Diffstat (limited to 'bl31/bl31_main.c')
| -rw-r--r-- | bl31/bl31_main.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/bl31/bl31_main.c b/bl31/bl31_main.c index 7f04d218..f95ef41a 100644 --- a/bl31/bl31_main.c +++ b/bl31/bl31_main.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013-2015, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2013-2016, 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: @@ -59,6 +59,12 @@ static uint32_t next_image_type = NON_SECURE; void bl31_lib_init(void) { cm_init(); + + /* + * Initialize the PSCI library here. This also does EL3 architectural + * setup. + */ + psci_setup((uintptr_t)bl31_warm_entrypoint); } /******************************************************************************* @@ -74,9 +80,6 @@ void bl31_main(void) NOTICE("BL31: %s\n", version_string); NOTICE("BL31: %s\n", build_message); - /* Perform remaining generic architectural setup from EL3 */ - bl31_arch_setup(); - /* Perform platform setup in BL31 */ bl31_platform_setup(); |