From 622eea7e815af39dbee290eddc487baab5e8a5f5 Mon Sep 17 00:00:00 2001 From: Aaron Durbin Date: Wed, 10 Feb 2016 23:15:07 -0600 Subject: 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 Reviewed-on: https://review.coreboot.org/13681 Reviewed-by: Patrick Georgi Tested-by: build bot (Jenkins) --- src/include/bootblock_common.h | 2 ++ src/include/bootstate.h | 9 ++++----- src/include/main_decl.h | 6 ++++++ 3 files changed, 12 insertions(+), 5 deletions(-) create mode 100644 src/include/main_decl.h (limited to 'src/include') diff --git a/src/include/bootblock_common.h b/src/include/bootblock_common.h index 1acbef4855..c8156d0236 100644 --- a/src/include/bootblock_common.h +++ b/src/include/bootblock_common.h @@ -16,6 +16,8 @@ #ifndef __BOOTBLOCK_COMMON_H #define __BOOTBLOCK_COMMON_H +#include + /* These are defined as weak no-ops that can be overridden by mainboard/SoC. */ void bootblock_mainboard_early_init(void); void bootblock_mainboard_init(void); diff --git a/src/include/bootstate.h b/src/include/bootstate.h index c38d2ba959..0889018e18 100644 --- a/src/include/bootstate.h +++ b/src/include/bootstate.h @@ -20,6 +20,10 @@ #include #include #include +/* Only declare main() when in ramstage. */ +#if ENV_RAMSTAGE +#include +#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. */ diff --git a/src/include/main_decl.h b/src/include/main_decl.h new file mode 100644 index 0000000000..90c17161ed --- /dev/null +++ b/src/include/main_decl.h @@ -0,0 +1,6 @@ +#ifndef _MAIN_DECL_H_ +#define _MAIN_DECL_H_ + +void main(void); + +#endif -- cgit v1.2.3