This code seems unnecessarily complex. We really just need to check the global_data. Now that is it all in one place, and not arch-specific, this is pretty easy.
Signed-off-by: Simon Glass sjg@chromium.org ---
arch/m68k/lib/board.c | 7 ------- arch/powerpc/lib/board.c | 8 -------- common/board_r.c | 14 -------------- common/main.c | 11 ++++------- include/common.h | 1 + 5 files changed, 5 insertions(+), 36 deletions(-)
diff --git a/arch/m68k/lib/board.c b/arch/m68k/lib/board.c index e75b6a9..5a853ad 100644 --- a/arch/m68k/lib/board.c +++ b/arch/m68k/lib/board.c @@ -629,13 +629,6 @@ void board_init_r (gd_t *id, ulong dest_addr) } #endif
-#ifdef CONFIG_MODEM_SUPPORT - { - extern int do_mdm_init; - do_mdm_init = gd->do_mdm_init; - } -#endif - #ifdef CONFIG_WATCHDOG /* disable watchdog if environment is set */ if ((s = getenv ("watchdog")) != NULL) { diff --git a/arch/powerpc/lib/board.c b/arch/powerpc/lib/board.c index f86c6f3..8c0f817 100644 --- a/arch/powerpc/lib/board.c +++ b/arch/powerpc/lib/board.c @@ -976,14 +976,6 @@ void board_init_r(gd_t *id, ulong dest_addr) kbd_init(); #endif
-#ifdef CONFIG_MODEM_SUPPORT - { - extern int do_mdm_init; - - do_mdm_init = gd->do_mdm_init; - } -#endif - /* Initialization complete - start the monitor */
/* main_loop() can return to retry autoboot, if so just run it again. */ diff --git a/common/board_r.c b/common/board_r.c index 8629a65..31f90ea 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -703,17 +703,6 @@ static int initr_kbd(void) } #endif
-#ifdef CONFIG_MODEM_SUPPORT -static int initr_modem(void) -{ - /* TODO: with new initcalls, move this into the driver */ - extern int do_mdm_init; - - do_mdm_init = gd->do_mdm_init; - return 0; -} -#endif - static int run_main_loop(void) { #ifdef CONFIG_SANDBOX @@ -928,9 +917,6 @@ init_fnc_t init_sequence_r[] = { #ifdef CONFIG_PS2KBD initr_kbd, #endif -#ifdef CONFIG_MODEM_SUPPORT - initr_modem, -#endif run_main_loop, };
diff --git a/common/main.c b/common/main.c index 91a5b18..0cb3973 100644 --- a/common/main.c +++ b/common/main.c @@ -14,17 +14,14 @@ #include <malloc.h> #include <version.h>
+DECLARE_GLOBAL_DATA_PTR; + /* * Board-specific Platform code can reimplement show_boot_progress () if needed */ void inline __show_boot_progress (int val) {} void show_boot_progress (int val) __attribute__((weak, alias("__show_boot_progress")));
-#ifdef CONFIG_MODEM_SUPPORT -int do_mdm_init = 0; -extern void mdm_init(void); /* defined in board.c */ -#endif - void main_loop(void) { #ifdef CONFIG_PREBOOT @@ -34,8 +31,8 @@ void main_loop(void) bootstage_mark_name(BOOTSTAGE_ID_MAIN_LOOP, "main_loop");
#ifdef CONFIG_MODEM_SUPPORT - debug("DEBUG: main_loop: do_mdm_init=%d\n", do_mdm_init); - if (do_mdm_init) { + debug("DEBUG: main_loop: gd->do_mdm_init=%lu\n", gd->do_mdm_init); + if (gd->do_mdm_init) { char *str = strdup(getenv("mdm_cmd")); setenv("preboot", str); /* set or delete definition */ if (str != NULL) diff --git a/include/common.h b/include/common.h index fbf3b14..3975e34 100644 --- a/include/common.h +++ b/include/common.h @@ -299,6 +299,7 @@ extern ulong monitor_flash_len; int mac_read_from_eeprom(void); extern u8 __dtb_dt_begin[]; /* embedded device tree blob */ int set_cpu_clk_info(void); +int mdm_init(void); #if defined(CONFIG_DISPLAY_CPUINFO) int print_cpuinfo(void); #else