Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 1364a0e48a64a29930a8b22620f420e8f4984cc7

Authored by Simon Glass
Committed by Tom Rini
1 parent 9272a9b4f6
Exists in v2017.01-smarct4x and in 40 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, imx_v2015.04_4.1.15_1.0.0_ga, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2017.03_4.9.11_1.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2015.04_4.1.15_1.0.0_ga, smarc-imx_v2017.03_4.9.11_1.0.0_ga, smarc-imx_v2017.03_4.9.88_2.0.0_ga, smarc-imx_v2017.03_o8.1.0_1.3.0_8m, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_2.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0, smarc_8mq_lf_v2020.04, ti-u-boot-2015.07, v2014.07, v2014.07-smarct33, v2014.07-smartmen, v2015.07-smarct33, v2015.07-smarct33-emmc, v2015.07-smarct4x, v2016.05-dlt, v2016.05-smarct3x, v2016.05-smarct3x-emmc, v2016.05-smarct4x, v2017.01-smarct3x, v2017.01-smarct3x-emmc

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>

Showing 1 changed file with 32 additions and 27 deletions Side-by-side Diff

... ... @@ -22,20 +22,8 @@
22 22 void inline __show_boot_progress (int val) {}
23 23 void show_boot_progress (int val) __attribute__((weak, alias("__show_boot_progress")));
24 24  
25   -void main_loop(void)
  25 +static void modem_init(void)
26 26 {
27   -#ifdef CONFIG_PREBOOT
28   - char *p;
29   -#endif
30   -
31   - bootstage_mark_name(BOOTSTAGE_ID_MAIN_LOOP, "main_loop");
32   -
33   -#ifndef CONFIG_SYS_GENERIC_BOARD
34   - puts("Warning: Your board does not use generic board. Please read\n");
35   - puts("doc/README.generic-board and take action. Boards not\n");
36   - puts("upgraded by the late 2014 may break or be removed.\n");
37   -#endif
38   -
39 27 #ifdef CONFIG_MODEM_SUPPORT
40 28 debug("DEBUG: main_loop: gd->do_mdm_init=%lu\n", gd->do_mdm_init);
41 29 if (gd->do_mdm_init) {
42 30  
43 31  
... ... @@ -46,22 +34,13 @@
46 34 mdm_init(); /* wait for modem connection */
47 35 }
48 36 #endif /* CONFIG_MODEM_SUPPORT */
  37 +}
49 38  
50   -#ifdef CONFIG_VERSION_VARIABLE
51   - {
52   - setenv("ver", version_string); /* set version variable */
53   - }
54   -#endif /* CONFIG_VERSION_VARIABLE */
55   -
56   -#ifdef CONFIG_SYS_HUSH_PARSER
57   - u_boot_hush_start();
58   -#endif
59   -
60   -#if defined(CONFIG_HUSH_INIT_VAR)
61   - hush_init_var();
62   -#endif
63   -
  39 +static void run_preboot_environment_command(void)
  40 +{
64 41 #ifdef CONFIG_PREBOOT
  42 + char *p;
  43 +
65 44 p = getenv("preboot");
66 45 if (p != NULL) {
67 46 # ifdef CONFIG_AUTOBOOT_KEYED
... ... @@ -75,6 +54,32 @@
75 54 # endif
76 55 }
77 56 #endif /* CONFIG_PREBOOT */
  57 +}
  58 +
  59 +void main_loop(void)
  60 +{
  61 + bootstage_mark_name(BOOTSTAGE_ID_MAIN_LOOP, "main_loop");
  62 +
  63 +#ifndef CONFIG_SYS_GENERIC_BOARD
  64 + puts("Warning: Your board does not use generic board. Please read\n");
  65 + puts("doc/README.generic-board and take action. Boards not\n");
  66 + puts("upgraded by the late 2014 may break or be removed.\n");
  67 +#endif
  68 +
  69 + modem_init();
  70 +#ifdef CONFIG_VERSION_VARIABLE
  71 + setenv("ver", version_string); /* set version variable */
  72 +#endif /* CONFIG_VERSION_VARIABLE */
  73 +
  74 +#ifdef CONFIG_SYS_HUSH_PARSER
  75 + u_boot_hush_start();
  76 +#endif
  77 +
  78 +#if defined(CONFIG_HUSH_INIT_VAR)
  79 + hush_init_var();
  80 +#endif
  81 +
  82 + run_preboot_environment_command();
78 83  
79 84 #if defined(CONFIG_UPDATE_TFTP)
80 85 update_tftp(0UL);