Commit 7a9a5f2d authored by Dan Handley's avatar Dan Handley Committed by Andrew Thoelke
Browse files

Remove unused data declarations

Some data variables were declared but not used. These have been
removed.

Change-Id: I038632af3c32d88984cd25b886c43ff763269bf9
parent c6bc0710
...@@ -31,11 +31,6 @@ ...@@ -31,11 +31,6 @@
#ifndef __BL2_H__ #ifndef __BL2_H__
#define __BL2_H__ #define __BL2_H__
/******************************************
* Data declarations
*****************************************/
extern unsigned long long bl2_entrypoint;
/****************************************** /******************************************
* Forward declarations * Forward declarations
*****************************************/ *****************************************/
......
...@@ -33,11 +33,6 @@ ...@@ -33,11 +33,6 @@
#include <stdint.h> #include <stdint.h>
/*******************************************************************************
* Data declarations
******************************************************************************/
extern unsigned long bl31_entrypoint;
/****************************************** /******************************************
* Forward declarations * Forward declarations
*****************************************/ *****************************************/
......
...@@ -423,19 +423,6 @@ typedef struct bl2_to_bl31_params_mem { ...@@ -423,19 +423,6 @@ typedef struct bl2_to_bl31_params_mem {
/******************************************************************************* /*******************************************************************************
* Function and variable prototypes * Function and variable prototypes
******************************************************************************/ ******************************************************************************/
unsigned long *bl1_normal_ram_base;
unsigned long *bl1_normal_ram_len;
unsigned long *bl1_normal_ram_limit;
unsigned long *bl1_normal_ram_zi_base;
unsigned long *bl1_normal_ram_zi_len;
unsigned long *bl1_coherent_ram_base;
unsigned long *bl1_coherent_ram_len;
unsigned long *bl1_coherent_ram_limit;
unsigned long *bl1_coherent_ram_zi_base;
unsigned long *bl1_coherent_ram_zi_len;
unsigned long warm_boot_entrypoint;
void bl1_plat_arch_setup(void); void bl1_plat_arch_setup(void);
void bl2_plat_arch_setup(void); void bl2_plat_arch_setup(void);
void bl31_plat_arch_setup(void); void bl31_plat_arch_setup(void);
......
...@@ -45,13 +45,11 @@ const spd_pm_ops_t *psci_spd_pm; ...@@ -45,13 +45,11 @@ const spd_pm_ops_t *psci_spd_pm;
/******************************************************************************* /*******************************************************************************
* Arrays that contains information needs to resume a cpu's execution when woken * Arrays that contains information needs to resume a cpu's execution when woken
* out of suspend or off states. 'psci_ns_einfo_idx' keeps track of the next * out of suspend or off states. Each cpu is allocated a single entry in each
* free index in the 'psci_ns_entry_info' & 'psci_suspend_context' arrays. Each * array during startup.
* cpu is allocated a single entry in each array during startup.
******************************************************************************/ ******************************************************************************/
suspend_context_t psci_suspend_context[PSCI_NUM_AFFS]; suspend_context_t psci_suspend_context[PSCI_NUM_AFFS];
ns_entry_info_t psci_ns_entry_info[PSCI_NUM_AFFS]; ns_entry_info_t psci_ns_entry_info[PSCI_NUM_AFFS];
unsigned int psci_ns_einfo_idx;
/******************************************************************************* /*******************************************************************************
* Grand array that holds the platform's topology information for state * Grand array that holds the platform's topology information for state
...@@ -61,16 +59,6 @@ unsigned int psci_ns_einfo_idx; ...@@ -61,16 +59,6 @@ unsigned int psci_ns_einfo_idx;
aff_map_node_t psci_aff_map[PSCI_NUM_AFFS] aff_map_node_t psci_aff_map[PSCI_NUM_AFFS]
__attribute__ ((section("tzfw_coherent_mem"))); __attribute__ ((section("tzfw_coherent_mem")));
/*******************************************************************************
* In a system, a certain number of affinity instances are present at an
* affinity level. The cumulative number of instances across all levels are
* stored in 'psci_aff_map'. The topology tree has been flattenned into this
* array. To retrieve nodes, information about the extents of each affinity
* level i.e. start index and end index needs to be present. 'psci_aff_limits'
* stores this information.
******************************************************************************/
aff_limits_node_t psci_aff_limits[MPIDR_MAX_AFFLVL + 1];
/******************************************************************************* /*******************************************************************************
* Pointer to functions exported by the platform to complete power mgmt. ops * Pointer to functions exported by the platform to complete power mgmt. ops
******************************************************************************/ ******************************************************************************/
......
...@@ -86,12 +86,8 @@ typedef unsigned int (*afflvl_power_on_finisher_t)(unsigned long, ...@@ -86,12 +86,8 @@ typedef unsigned int (*afflvl_power_on_finisher_t)(unsigned long,
******************************************************************************/ ******************************************************************************/
extern suspend_context_t psci_suspend_context[PSCI_NUM_AFFS]; extern suspend_context_t psci_suspend_context[PSCI_NUM_AFFS];
extern ns_entry_info_t psci_ns_entry_info[PSCI_NUM_AFFS]; extern ns_entry_info_t psci_ns_entry_info[PSCI_NUM_AFFS];
extern unsigned int psci_ns_einfo_idx;
extern aff_limits_node_t psci_aff_limits[MPIDR_MAX_AFFLVL + 1];
extern const plat_pm_ops_t *psci_plat_pm_ops; extern const plat_pm_ops_t *psci_plat_pm_ops;
extern aff_map_node_t psci_aff_map[PSCI_NUM_AFFS]; extern aff_map_node_t psci_aff_map[PSCI_NUM_AFFS];
extern afflvl_power_on_finisher_t psci_afflvl_off_finish_handlers[];
extern afflvl_power_on_finisher_t psci_afflvl_sus_finish_handlers[];
/******************************************************************************* /*******************************************************************************
* SPD's power management hooks registered with PSCI * SPD's power management hooks registered with PSCI
......
...@@ -47,6 +47,22 @@ ...@@ -47,6 +47,22 @@
******************************************************************************/ ******************************************************************************/
static cpu_context_t psci_ns_context[PLATFORM_CORE_COUNT]; static cpu_context_t psci_ns_context[PLATFORM_CORE_COUNT];
/*******************************************************************************
* In a system, a certain number of affinity instances are present at an
* affinity level. The cumulative number of instances across all levels are
* stored in 'psci_aff_map'. The topology tree has been flattenned into this
* array. To retrieve nodes, information about the extents of each affinity
* level i.e. start index and end index needs to be present. 'psci_aff_limits'
* stores this information.
******************************************************************************/
static aff_limits_node_t psci_aff_limits[MPIDR_MAX_AFFLVL + 1];
/*******************************************************************************
* 'psci_ns_einfo_idx' keeps track of the next free index in the
* 'psci_ns_entry_info' & 'psci_suspend_context' arrays.
******************************************************************************/
static unsigned int psci_ns_einfo_idx;
/******************************************************************************* /*******************************************************************************
* Routines for retrieving the node corresponding to an affinity level instance * Routines for retrieving the node corresponding to an affinity level instance
* in the mpidr. The first one uses binary search to find the node corresponding * in the mpidr. The first one uses binary search to find the node corresponding
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment