andrius
/
arm-trusted-firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #1302 from hzhuang1/fix_build 

Fix build with clang on hikey
This commit is contained in:
davidcunado-arm 2018-03-07 22:49:59 +00:00 committed by GitHub
parent dbf9f28316 84b589c9e7
commit f5c1eed22c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plat/hisilicon/hikey/hikey_bl1_setup.c
View File

@ -572,7 +572,7 @@ image_desc_t *bl1_plat_get_image_desc(unsigned int image_id)
void bl1_plat_set_ep_info(unsigned int image_id,
entry_point_info_t *ep_info)
{
unsigned int data = 0;
uint64_t data = 0;
if (image_id == BL2_IMAGE_ID)
return;
@ -583,7 +583,7 @@ void bl1_plat_set_ep_info(unsigned int image_id,
__asm__ volatile ("msr cpacr_el1, %0" : : "r"(data));
__asm__ volatile ("mrs %0, cpacr_el1" : "=r"(data));
} while ((data & (3 << 20)) != (3 << 20));
INFO("cpacr_el1:0x%x\n", data);
INFO("cpacr_el1:0x%lx\n", data);
ep_info->args.arg0 = 0xffff & read_mpidr();
ep_info->spsr = SPSR_64(MODE_EL1, MODE_SP_ELX,

6
plat/hisilicon/hikey960/drivers/pwrc/hisi_pwrc.c
View File

@ -287,9 +287,9 @@ void hisi_enable_pdc(unsigned int cluster)
mmio_write_32((uintptr_t)pdc_base_addr, 0x1);
}
static inline void hisi_pdc_set_intmask(void *pdc_base_addr,
unsigned int core,
enum pdc_finish_int_mask intmask)
void hisi_pdc_set_intmask(void *pdc_base_addr,
unsigned int core,
enum pdc_finish_int_mask intmask)
{
unsigned int val;