Commit 51675206 authored by Soby Mathew's avatar Soby Mathew Committed by TrustedFirmware Code Review
Browse files

Merge "rk3399: m0: Fix compiler warnings." into integration

parents f80a60ce af81a91f
...@@ -55,7 +55,7 @@ static void ddr_set_pll(void) ...@@ -55,7 +55,7 @@ static void ddr_set_pll(void)
mmio_write_32(CRU_BASE + CRU_DPLL_CON3, PLL_MODE(PLL_NORMAL_MODE)); 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(0, 927), (1 << 22));
mmio_setbits_32(PHY_REG(1, 927), (1 << 22)); mmio_setbits_32(PHY_REG(1, 927), (1 << 22));
......
...@@ -23,7 +23,7 @@ void WEAK svc_handler(void); ...@@ -23,7 +23,7 @@ void WEAK svc_handler(void);
void WEAK pend_sv_handler(void); void WEAK pend_sv_handler(void);
void WEAK systick_handler(void); void WEAK systick_handler(void);
extern int main(void); extern int m0_main(void);
/* Function prototypes */ /* Function prototypes */
static void default_reset_handler(void); static void default_reset_handler(void);
...@@ -59,12 +59,12 @@ void (* const g_pfnVectors[])(void) = { ...@@ -59,12 +59,12 @@ void (* const g_pfnVectors[])(void) = {
* This is the code that gets called when the processor first * This is the code that gets called when the processor first
* starts execution following a reset event. Only the absolutely * starts execution following a reset event. Only the absolutely
* necessary set is performed, after which the application * 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) static void default_reset_handler(void)
{ {
/* call the application's entry point */ /* call the application's entry point */
main(); m0_main();
} }
/** /**
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
#define SCR_SLEEPDEEP_SHIFT (1 << 2) #define SCR_SLEEPDEEP_SHIFT (1 << 2)
__attribute__((noreturn)) void main(void) __attribute__((noreturn)) void m0_main(void)
{ {
unsigned int status_value; unsigned int status_value;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment