From 44443696afed62f074dab1468c270ab207f5bb69 Mon Sep 17 00:00:00 2001 From: Asami Doi Date: Fri, 12 Jul 2019 12:46:02 +0900 Subject: lib: Remove the BOOTBLOCK_CUSTOM compile guard This CL allows that everyone can use main() in lib/bootblock.c even if you select CONFIG_BOOTBLOCK_CUSTOM. I also rename main functions used in some soc/ to avoid the collision with the main function defined at lib/bootblock.c. Change-Id: I0575c9d1ce9dea9facfcc86760dff4deee9c1e29 Signed-off-by: Asami Doi Reviewed-on: https://review.coreboot.org/c/coreboot/+/34250 Reviewed-by: Julius Werner Tested-by: build bot (Jenkins) --- src/arch/mips/bootblock.S | 2 +- src/arch/mips/bootblock_simple.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'src/arch') diff --git a/src/arch/mips/bootblock.S b/src/arch/mips/bootblock.S index 849c168fd0..f8049c96d4 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 84029ebedb..e195b6ac85 100644 --- a/src/arch/mips/bootblock_simple.c +++ b/src/arch/mips/bootblock_simple.c @@ -19,7 +19,10 @@ #include #include -void main(void) +/* called from assembly in bootblock.S */ +void mips_main(void); + +void mips_main(void) { bootblock_cpu_init(); -- cgit v1.2.3