Djam/arm-trusted-firmware
1
0
Fork 0
mirror of https://github.com/ARM-software/arm-trusted-firmware.git synced 2025-04-17 01:54:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

move timer #defines & remove duplicate declaration

Browse source 
This patch removes the duplicate declaration of psci_cpu_on in psci.h
and moves the constants for the system level implementation of the
generic timer from arch_helpers.h to arch.h. All other architectural
constants are defined in arch.h so there is no need to add them to
arch_helpers.h

Change-Id: Ia8ad3f91854f7e57fce31873773eede55c384ff1
This commit is contained in:
Achin Gupta 2013-10-31 11:27:43 +00:00 • committed by Dan Handley
parent c8afc78919
commit c2b43afc54
3 changed files with 10 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
include/aarch64/arch.h
View file

@ -70,6 +70,16 @@
******************************************************************************/
#define CPUECTLR_EL1 S3_1_C15_C2_1
/*******************************************************************************
* Generic timer memory mapped registers & offsets
******************************************************************************/
#define CNTCR_OFF 0x000
#define CNTFID_OFF 0x020
#define CNTCR_EN (1 << 0)
#define CNTCR_HDBG (1 << 1)
#define CNTCR_FCREQ(x) (1 << (8 + (x)))
/*******************************************************************************
* System register bit definitions
******************************************************************************/

10
include/aarch64/arch_helpers.h
View file

@ -33,16 +33,6 @@
#include <arch.h>
/*******************************************************************************
* Generic timer memory mapped registers & offsets
******************************************************************************/
#define CNTCR_OFF 0x000
#define CNTFID_OFF 0x020
#define CNTCR_EN (1 << 0)
#define CNTCR_HDBG (1 << 1)
#define CNTCR_FCREQ(x) (1 << (8 + (x)))
#ifndef __ASSEMBLY__
/*******************************************************************************

3
include/psci.h
View file

@ -143,9 +143,6 @@ typedef struct {
* Function & Data prototypes
******************************************************************************/
extern unsigned int psci_version(void);
extern int psci_cpu_on(unsigned long,
unsigned long,
unsigned long);
extern int __psci_cpu_suspend(unsigned int, unsigned long, unsigned long);
extern int __psci_cpu_off(void);
extern int psci_affinity_info(unsigned long, unsigned int);