From 056b3d49b234f74e9bf148978cadd35332ef46b3 Mon Sep 17 00:00:00 2001 From: Haojian Zhuang Date: Fri, 2 Mar 2018 14:23:55 +0800 Subject: [PATCH 1/2] hikey960: fix build issue with CLANG plat/hisilicon/hikey960/drivers/pwrc/hisi_pwrc.c:290:20: error: unused function 'hisi_pdc_set_intmask' [-Werror,-Wunused-function] static inline void hisi_pdc_set_intmask(void *pdc_base_addr, ^ 1 error generated. Makefile:605: recipe for target 'build/hikey960/release/bl31/hisi_pwrc.o' failed make: *** [build/hikey960/release/bl31/hisi_pwrc.o] Error 1 Signed-off-by: Haojian Zhuang --- plat/hisilicon/hikey960/drivers/pwrc/hisi_pwrc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/plat/hisilicon/hikey960/drivers/pwrc/hisi_pwrc.c b/plat/hisilicon/hikey960/drivers/pwrc/hisi_pwrc.c index 9fdc3e746..45fcd42b4 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; From 84b589c9e703c11bf3449d62c09c2363c2520b99 Mon Sep 17 00:00:00 2001 From: Haojian Zhuang Date: Fri, 2 Mar 2018 14:25:41 +0800 Subject: [PATCH 2/2] hikey: fix build issue with CLANG plat/hisilicon/hikey/hikey_bl1_setup.c:565:47: error: value size does not match register size specified by the constraint and modifier [-Werror,-Wasm-operand-widths] __asm__ volatile ("mrs %0, cpacr_el1" : "=r"(data)); Signed-off-by: Haojian Zhuang --- plat/hisilicon/hikey/hikey_bl1_setup.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plat/hisilicon/hikey/hikey_bl1_setup.c b/plat/hisilicon/hikey/hikey_bl1_setup.c index df0ad8e03..52dcf6b1e 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,