diff options
author | davidcunado-arm <david.cunado@arm.com> | 2018-03-07 22:49:59 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-03-07 22:49:59 +0000 |
commit | f5c1eed22c885482eda40153d8ce894afb5131ad (patch) | |
tree | 75cb2500a3b1a81eee10c39cf162072c6494277a | |
parent | dbf9f283163e1575fbcd25a64c2313771dfe3bb4 (diff) | |
parent | 84b589c9e703c11bf3449d62c09c2363c2520b99 (diff) | |
download | trusted-firmware-a-f5c1eed22c885482eda40153d8ce894afb5131ad.tar.gz |
Merge pull request #1302 from hzhuang1/fix_build
Fix build with clang on hikey
-rw-r--r-- | plat/hisilicon/hikey/hikey_bl1_setup.c | 4 | ||||
-rw-r--r-- | plat/hisilicon/hikey960/drivers/pwrc/hisi_pwrc.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/plat/hisilicon/hikey/hikey_bl1_setup.c b/plat/hisilicon/hikey/hikey_bl1_setup.c index df0ad8e037..52dcf6b1e1 100644 --- a/plat/hisilicon/hikey/hikey_bl1_setup.c +++ b/plat/hisilicon/hikey/hikey_bl1_setup.c @@ -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, diff --git a/plat/hisilicon/hikey960/drivers/pwrc/hisi_pwrc.c b/plat/hisilicon/hikey960/drivers/pwrc/hisi_pwrc.c index 9fdc3e7461..45fcd42b40 100644 --- a/plat/hisilicon/hikey960/drivers/pwrc/hisi_pwrc.c +++ b/plat/hisilicon/hikey960/drivers/pwrc/hisi_pwrc.c @@ -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; |