diff options
| author | Randall Spangler <rspangler@chromium.org> | 2013-04-04 14:51:06 -0700 |
|---|---|---|
| committer | ChromeBot <chrome-bot@google.com> | 2013-04-05 14:28:42 -0700 |
| commit | 14adad27e8534852df01bd3b3a86c551f78cf21c (patch) | |
| tree | 28a5dc4b3db5a8d4e2d37e81c4dd40ae31ef0897 /common/main.c | |
| parent | 765c50ef5fc77aec2ef0abca7a76f000b4167d57 (diff) | |
| download | chrome-ec-14adad27e8534852df01bd3b3a86c551f78cf21c.tar.gz | |
Clean up board configuration
Board configuration interfaces are now defined in board_config.h, not
in every board.h file.
Tidied /alphabetized CONFIG defines.
No functional changes, just rearranging code.
BUG=chrome-os-partner:18343
BRANCH=none
TEST=build all targets
Change-Id: I6196591784f8fa9ce6dfccd31891b679fb200063
Signed-off-by: Randall Spangler <rspangler@chromium.org>
Reviewed-on: https://gerrit.chromium.org/gerrit/47419
Diffstat (limited to 'common/main.c')
| -rw-r--r-- | common/main.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/common/main.c b/common/main.c index 6ee477931f..2430caac79 100644 --- a/common/main.c +++ b/common/main.c @@ -5,6 +5,7 @@ * Main routine for Chrome EC */ +#include "board_config.h" #include "clock.h" #include "common.h" #include "console.h" @@ -35,14 +36,16 @@ int main(void) * initialization. In particular, modules should NOT enable * interrupts. */ +#ifdef CONFIG_BOARD_PRE_INIT + board_config_pre_init(); +#endif /* Configure the pin multiplexers and GPIOs */ - configure_board(); jtag_pre_init(); gpio_pre_init(); -#ifdef CONFIG_CONFIGURE_BOARD_LATE - configure_board_late(); +#ifdef CONFIG_BOARD_POST_GPIO_INIT + board_config_post_gpio_init(); #endif /* * Initialize interrupts, but don't enable any of them. Note that |