diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/drivers/arm/css/scmi.h | 4 | ||||
| -rw-r--r-- | include/drivers/console.h | 9 | ||||
| -rw-r--r-- | include/plat/arm/common/plat_arm.h | 1 |
3 files changed, 8 insertions, 6 deletions
diff --git a/include/drivers/arm/css/scmi.h b/include/drivers/arm/css/scmi.h index df259f76d..1f8dc6cce 100644 --- a/include/drivers/arm/css/scmi.h +++ b/include/drivers/arm/css/scmi.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017-2018, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2017-2019, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -162,7 +162,7 @@ int scmi_ap_core_set_reset_addr(void *p, uint64_t reset_addr, uint32_t attr); int scmi_ap_core_get_reset_addr(void *p, uint64_t *reset_addr, uint32_t *attr); /* API to get the platform specific SCMI channel information. */ -scmi_channel_plat_info_t *plat_css_get_scmi_info(); +scmi_channel_plat_info_t *plat_css_get_scmi_info(void); /* API to override default PSCI callbacks for platforms that support SCMI. */ const plat_psci_ops_t *css_scmi_override_pm_ops(plat_psci_ops_t *ops); diff --git a/include/drivers/console.h b/include/drivers/console.h index 24887f908..4f26ccef2 100644 --- a/include/drivers/console.h +++ b/include/drivers/console.h @@ -49,11 +49,12 @@ typedef struct console { #include <drivers/console_assertions.h> /* - * NOTE: There is no publicly accessible console_register() function. Consoles - * are registered by directly calling the register function of a specific - * implementation, e.g. console_16550_register() from <uart_16550.h>. Consoles - * registered that way can be unregistered/reconfigured with below functions. + * Add a console_t instance to the console list. This should only be called by + * console drivers after they have initialized all fields in the console + * structure. Platforms seeking to register a new console need to call the + * respective console__register() function instead. */ +int console_register(console_t *console); /* Remove a single console_t instance from the console list. Return a pointer to * the console that was removed if it was found, or NULL if not. */ console_t *console_unregister(console_t *console); diff --git a/include/plat/arm/common/plat_arm.h b/include/plat/arm/common/plat_arm.h index 9d6786f5e..527375f6a 100644 --- a/include/plat/arm/common/plat_arm.h +++ b/include/plat/arm/common/plat_arm.h @@ -187,6 +187,7 @@ void arm_bl2_platform_setup(void); void arm_bl2_plat_arch_setup(void); uint32_t arm_get_spsr_for_bl32_entry(void); uint32_t arm_get_spsr_for_bl33_entry(void); +int arm_bl2_plat_handle_post_image_load(unsigned int image_id); int arm_bl2_handle_post_image_load(unsigned int image_id); struct bl_params *arm_get_next_bl_params(void); |