summaryrefslogtreecommitdiffstats
path: root/src/arch/mips
diff options
context:
space:
mode:
Diffstat (limited to 'src/arch/mips')
-rw-r--r--src/arch/mips/bootblock.S2
-rw-r--r--src/arch/mips/bootblock_simple.c5
2 files changed, 5 insertions, 2 deletions
diff --git a/src/arch/mips/bootblock.S b/src/arch/mips/bootblock.S
index 849c168fd0cf..f8049c96d41c 100644
--- a/src/arch/mips/bootblock.S
+++ b/src/arch/mips/bootblock.S
@@ -33,7 +33,7 @@ _start:
addi $t0, $t0, 4
/* Run main */
- b main
+ b mips_main
/*
* Should never return from main. Make sure there is no branch in the
diff --git a/src/arch/mips/bootblock_simple.c b/src/arch/mips/bootblock_simple.c
index 84029ebedbb9..e195b6ac8589 100644
--- a/src/arch/mips/bootblock_simple.c
+++ b/src/arch/mips/bootblock_simple.c
@@ -19,7 +19,10 @@
#include <halt.h>
#include <program_loading.h>
-void main(void)
+/* called from assembly in bootblock.S */
+void mips_main(void);
+
+void mips_main(void)
{
bootblock_cpu_init();