V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Simplify the main loop 

The main loop is easier to follow if the code is grouped into separate
functions. Make this change, so that main_loop() is easier to read.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2014-04-10 20:01:33 -06:00 committed by Tom Rini
parent 9272a9b4f6
commit 1364a0e48a
1 changed files with 32 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
common/main.c
View File

@ -22,20 +22,8 @@ DECLARE_GLOBAL_DATA_PTR;
void inline __show_boot_progress (int val) {} void inline __show_boot_progress (int val) {}
void show_boot_progress (int val) __attribute__((weak, alias("__show_boot_progress"))); void show_boot_progress (int val) __attribute__((weak, alias("__show_boot_progress")));
void main_loop(void) static void modem_init(void)
{ {
#ifdef CONFIG_PREBOOT
char *p;
#endif
bootstage_mark_name(BOOTSTAGE_ID_MAIN_LOOP, "main_loop");
#ifndef CONFIG_SYS_GENERIC_BOARD
puts("Warning: Your board does not use generic board. Please read\n");
puts("doc/README.generic-board and take action. Boards not\n");
puts("upgraded by the late 2014 may break or be removed.\n");
#endif
#ifdef CONFIG_MODEM_SUPPORT #ifdef CONFIG_MODEM_SUPPORT
debug("DEBUG: main_loop: gd->do_mdm_init=%lu\n", gd->do_mdm_init); debug("DEBUG: main_loop: gd->do_mdm_init=%lu\n", gd->do_mdm_init);
if (gd->do_mdm_init) { if (gd->do_mdm_init) {
@ -46,22 +34,13 @@ void main_loop(void)
mdm_init(); /* wait for modem connection */ mdm_init(); /* wait for modem connection */
} }
#endif /* CONFIG_MODEM_SUPPORT */ #endif /* CONFIG_MODEM_SUPPORT */
}
#ifdef CONFIG_VERSION_VARIABLE static void run_preboot_environment_command(void)
{ {
setenv("ver", version_string); /* set version variable */
}
#endif /* CONFIG_VERSION_VARIABLE */
#ifdef CONFIG_SYS_HUSH_PARSER
u_boot_hush_start();
#endif
#if defined(CONFIG_HUSH_INIT_VAR)
hush_init_var();
#endif
#ifdef CONFIG_PREBOOT #ifdef CONFIG_PREBOOT
char *p;
p = getenv("preboot"); p = getenv("preboot");
if (p != NULL) { if (p != NULL) {
# ifdef CONFIG_AUTOBOOT_KEYED # ifdef CONFIG_AUTOBOOT_KEYED
@ -75,6 +54,32 @@ void main_loop(void)
# endif # endif
} }
#endif /* CONFIG_PREBOOT */ #endif /* CONFIG_PREBOOT */
}
void main_loop(void)
{
bootstage_mark_name(BOOTSTAGE_ID_MAIN_LOOP, "main_loop");
#ifndef CONFIG_SYS_GENERIC_BOARD
puts("Warning: Your board does not use generic board. Please read\n");
puts("doc/README.generic-board and take action. Boards not\n");
puts("upgraded by the late 2014 may break or be removed.\n");
#endif
modem_init();
#ifdef CONFIG_VERSION_VARIABLE
setenv("ver", version_string); /* set version variable */
#endif /* CONFIG_VERSION_VARIABLE */
#ifdef CONFIG_SYS_HUSH_PARSER
u_boot_hush_start();
#endif
#if defined(CONFIG_HUSH_INIT_VAR)
hush_init_var();
#endif
run_preboot_environment_command();
#if defined(CONFIG_UPDATE_TFTP) #if defined(CONFIG_UPDATE_TFTP)
update_tftp(0UL); update_tftp(0UL);