diff options
| author | Alexei Fedorov <Alexei.Fedorov@arm.com> | 2020-01-30 16:55:55 +0000 |
|---|---|---|
| committer | TrustedFirmware Code Review <review@review.trustedfirmware.org> | 2020-01-30 16:55:55 +0000 |
| commit | f69a5828b74ca27bd3872de9c8c6c5a107915c49 (patch) | |
| tree | 4b0d21b6ac7e97e2e90e56d28dc91b1e7202d366 /include | |
| parent | b7e0ed2c7190616e4e0dae2ee8e8b0cc1ce718e5 (diff) | |
| parent | f1be00da0b0acf90355558e01d5f8e1f79c0d481 (diff) | |
| download | platform_external_arm-trusted-firmware-f69a5828b74ca27bd3872de9c8c6c5a107915c49.tar.gz platform_external_arm-trusted-firmware-f69a5828b74ca27bd3872de9c8c6c5a107915c49.tar.bz2 platform_external_arm-trusted-firmware-f69a5828b74ca27bd3872de9c8c6c5a107915c49.zip | |
Merge "Use correct type when reading SCR register" into integration
Diffstat (limited to 'include')
| -rw-r--r-- | include/bl31/interrupt_mgmt.h | 4 | ||||
| -rw-r--r-- | include/lib/el3_runtime/context_mgmt.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/include/bl31/interrupt_mgmt.h b/include/bl31/interrupt_mgmt.h index 8bb1bab24..935bf7766 100644 --- a/include/bl31/interrupt_mgmt.h +++ b/include/bl31/interrupt_mgmt.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014-2018, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2014-2020, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -134,7 +134,7 @@ typedef uint64_t (*interrupt_type_handler_t)(uint32_t id, /******************************************************************************* * Function & variable prototypes ******************************************************************************/ -uint32_t get_scr_el3_from_routing_model(uint32_t security_state); +u_register_t get_scr_el3_from_routing_model(uint32_t security_state); int32_t set_routing_model(uint32_t type, uint32_t flags); int32_t register_interrupt_type_handler(uint32_t type, interrupt_type_handler_t handler, diff --git a/include/lib/el3_runtime/context_mgmt.h b/include/lib/el3_runtime/context_mgmt.h index 7c996d124..17955e3a8 100644 --- a/include/lib/el3_runtime/context_mgmt.h +++ b/include/lib/el3_runtime/context_mgmt.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013-2018, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2013-2020, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -45,7 +45,7 @@ void cm_write_scr_el3_bit(uint32_t security_state, uint32_t bit_pos, uint32_t value); void cm_set_next_eret_context(uint32_t security_state); -uint32_t cm_get_scr_el3(uint32_t security_state); +u_register_t cm_get_scr_el3(uint32_t security_state); /* Inline definitions */ |