diff options
| author | Aaron Durbin <adurbin@chromium.org> | 2016-02-10 23:15:07 -0600 |
|---|---|---|
| committer | Aaron Durbin <adurbin@chromium.org> | 2016-02-11 23:29:08 +0100 |
| commit | 622eea7e815af39dbee290eddc487baab5e8a5f5 (patch) | |
| tree | dd45122a65037ae0cefcbd1a39181f8b108a705a /src/include/bootstate.h | |
| parent | 711455f24495d1616fff6ec93da11e5f7a863a8b (diff) | |
| download | coreboot-622eea7e815af39dbee290eddc487baab5e8a5f5.tar.gz coreboot-622eea7e815af39dbee290eddc487baab5e8a5f5.tar.bz2 coreboot-622eea7e815af39dbee290eddc487baab5e8a5f5.zip | |
arches: lib: add main_decl.h for main() declaration
It is silly to have a single header to declare the main()
symbol, however some of the arches provided it while
lib/bootblock.c relied on the arch headers to declare it. Just
move the declaration into its own header file and utilize it.
Change-Id: I743b4c286956ae047c17fe46241b699feca73628
Signed-off-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-on: https://review.coreboot.org/13681
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
Tested-by: build bot (Jenkins)
Diffstat (limited to 'src/include/bootstate.h')
| -rw-r--r-- | src/include/bootstate.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/include/bootstate.h b/src/include/bootstate.h index c38d2ba9596e..0889018e1841 100644 --- a/src/include/bootstate.h +++ b/src/include/bootstate.h @@ -20,6 +20,10 @@ #include <stdlib.h> #include <stddef.h> #include <stdint.h> +/* Only declare main() when in ramstage. */ +#if ENV_RAMSTAGE +#include <main_decl.h> +#endif /* Control debugging of the boot state machine. */ #define BOOT_STATE_DEBUG 0 @@ -168,11 +172,6 @@ int boot_state_unblock(boot_state_t state, boot_state_sequence_t seq); void boot_state_current_block(void); void boot_state_current_unblock(void); -#if ENV_RAMSTAGE -/* Entry into the boot state machine. */ -void main(void); -#endif - /* In order to schedule boot state callbacks at compile-time specify the * entries in an array using the BOOT_STATE_INIT_ENTRIES and * BOOT_STATE_INIT_ENTRY macros below. */ |