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

m68k: powerpc: Clean up do_mdm_init 

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>
This commit is contained in:
Simon Glass 2014-04-10 20:01:32 -06:00 committed by Tom Rini
parent b26440f1fa
commit 9272a9b4f6
5 changed files with 5 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
arch/m68k/lib/board.c
View File

@ -628,13 +628,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) {

8
arch/powerpc/lib/board.c
View File

@ -991,14 +991,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. */

14
common/board_r.c
View File

@ -704,17 +704,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[] = {
#endif
#ifdef CONFIG_PS2KBD
initr_kbd,
#endif
#ifdef CONFIG_MODEM_SUPPORT
initr_modem,
#endif
run_main_loop,
};

11
common/main.c
View File

@ -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
@ -40,8 +37,8 @@ void main_loop(void)
#endif
#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)

1
include/common.h
View File

@ -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