diff options
| author | Asami Doi <d0iasm.pub@gmail.com> | 2019-07-12 12:46:02 +0900 |
|---|---|---|
| committer | Julius Werner <jwerner@chromium.org> | 2019-07-17 23:15:08 +0000 |
| commit | 44443696afed62f074dab1468c270ab207f5bb69 (patch) | |
| tree | 4770d5702134f49ae075ef1407b86812dbeb6bbd /src/mainboard/emulation | |
| parent | 4593d66a20d6acc78ae81db384f7df5212766985 (diff) | |
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 <d0iasm.pub@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/34250
Reviewed-by: Julius Werner <jwerner@chromium.org>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src/mainboard/emulation')
| -rw-r--r-- | src/mainboard/emulation/qemu-power8/bootblock.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/mainboard/emulation/qemu-power8/bootblock.c b/src/mainboard/emulation/qemu-power8/bootblock.c index bf918cfa9f..ec30c879f1 100644 --- a/src/mainboard/emulation/qemu-power8/bootblock.c +++ b/src/mainboard/emulation/qemu-power8/bootblock.c @@ -17,10 +17,12 @@ #include <console/console.h> #include <program_loading.h> +void qemu_power8_main(void); + /* The qemu part of all this is very, very non-hardware like. * So it gets its own bootblock. */ -void main(void) +void qemu_power8_main(void) { if (CONFIG(BOOTBLOCK_CONSOLE)) { console_init(); |