diff options
| author | Soby Mathew <soby.mathew@arm.com> | 2019-04-26 12:55:49 +0000 |
|---|---|---|
| committer | TrustedFirmware Code Review <review@review.trustedfirmware.org> | 2019-04-26 12:55:49 +0000 |
| commit | 5167520610a81d422cfeb0dc27cc746797cd8189 (patch) | |
| tree | f4989293fec64e7b7089216d6a0023cfc44aaa42 /plat/rockchip | |
| parent | f80a60ce2936064e4b1319326b68acaa92b9f802 (diff) | |
| parent | af81a91ff43c94c6b817320d8fb1706637a1fc70 (diff) | |
Merge "rk3399: m0: Fix compiler warnings." into integration
Diffstat (limited to 'plat/rockchip')
| -rw-r--r-- | plat/rockchip/rk3399/drivers/m0/src/dram.c | 2 | ||||
| -rw-r--r-- | plat/rockchip/rk3399/drivers/m0/src/startup.c | 6 | ||||
| -rw-r--r-- | plat/rockchip/rk3399/drivers/m0/src/suspend.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/plat/rockchip/rk3399/drivers/m0/src/dram.c b/plat/rockchip/rk3399/drivers/m0/src/dram.c index b939a960..84e88849 100644 --- a/plat/rockchip/rk3399/drivers/m0/src/dram.c +++ b/plat/rockchip/rk3399/drivers/m0/src/dram.c @@ -55,7 +55,7 @@ static void ddr_set_pll(void) mmio_write_32(CRU_BASE + CRU_DPLL_CON3, PLL_MODE(PLL_NORMAL_MODE)); } -__attribute__((noreturn)) void main(void) +__attribute__((noreturn)) void m0_main(void) { mmio_setbits_32(PHY_REG(0, 927), (1 << 22)); mmio_setbits_32(PHY_REG(1, 927), (1 << 22)); diff --git a/plat/rockchip/rk3399/drivers/m0/src/startup.c b/plat/rockchip/rk3399/drivers/m0/src/startup.c index dba03137..dfd8af23 100644 --- a/plat/rockchip/rk3399/drivers/m0/src/startup.c +++ b/plat/rockchip/rk3399/drivers/m0/src/startup.c @@ -23,7 +23,7 @@ void WEAK svc_handler(void); void WEAK pend_sv_handler(void); void WEAK systick_handler(void); -extern int main(void); +extern int m0_main(void); /* Function prototypes */ static void default_reset_handler(void); @@ -59,12 +59,12 @@ void (* const g_pfnVectors[])(void) = { * This is the code that gets called when the processor first * starts execution following a reset event. Only the absolutely * necessary set is performed, after which the application - * supplied main() routine is called. + * supplied m0_main() routine is called. */ static void default_reset_handler(void) { /* call the application's entry point */ - main(); + m0_main(); } /** diff --git a/plat/rockchip/rk3399/drivers/m0/src/suspend.c b/plat/rockchip/rk3399/drivers/m0/src/suspend.c index 39dfd113..9ad2fa26 100644 --- a/plat/rockchip/rk3399/drivers/m0/src/suspend.c +++ b/plat/rockchip/rk3399/drivers/m0/src/suspend.c @@ -11,7 +11,7 @@ #define SCR_SLEEPDEEP_SHIFT (1 << 2) -__attribute__((noreturn)) void main(void) +__attribute__((noreturn)) void m0_main(void) { unsigned int status_value; |