From de30122bb58fee7b0f94bcfabab595b6ad757336 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Wed, 4 Apr 2012 18:53:41 +0000 Subject: [PATCH] net: move bootfile init into eth_initialize All arches init this the same way, so move the logic into the core net code to avoid duplicating it everywhere else. Signed-off-by: Mike Frysinger Reviewed-by: Joe Hershberger --- arch/arm/lib/board.c | 8 -------- arch/avr32/lib/board.c | 3 --- arch/blackfin/lib/board.c | 7 +------ arch/m68k/lib/board.c | 5 ----- arch/microblaze/lib/board.c | 4 ---- arch/mips/lib/board.c | 8 -------- arch/nds32/lib/board.c | 6 ------ arch/powerpc/lib/board.c | 8 -------- arch/sh/lib/board.c | 11 ++--------- arch/sparc/lib/board.c | 5 ----- arch/x86/include/asm/init_helpers.h | 1 - arch/x86/lib/board.c | 3 --- arch/x86/lib/init_helpers.c | 12 ------------ net/eth.c | 10 ++++++++++ 14 files changed, 13 insertions(+), 78 deletions(-) diff --git a/arch/arm/lib/board.c b/arch/arm/lib/board.c index 66dfb13..024646c 100644 --- a/arch/arm/lib/board.c +++ b/arch/arm/lib/board.c @@ -592,14 +592,6 @@ void board_init_r(gd_t *id, ulong dest_addr) /* Initialize from environment */ load_addr = getenv_ulong("loadaddr", 16, load_addr); -#if defined(CONFIG_CMD_NET) - { - char *s = getenv("bootfile"); - - if (s != NULL) - copy_filename(BootFile, s, sizeof(BootFile)); - } -#endif #ifdef CONFIG_BOARD_LATE_INIT board_late_init(); diff --git a/arch/avr32/lib/board.c b/arch/avr32/lib/board.c index 3c2d0fb..b390a6c 100644 --- a/arch/avr32/lib/board.c +++ b/arch/avr32/lib/board.c @@ -327,9 +327,6 @@ void board_init_r(gd_t *new_gd, ulong dest_addr) bb_miiphy_init(); #endif #if defined(CONFIG_CMD_NET) - s = getenv("bootfile"); - if (s) - copy_filename(BootFile, s, sizeof(BootFile)); puts("Net: "); eth_initialize(gd->bd); #endif diff --git a/arch/blackfin/lib/board.c b/arch/blackfin/lib/board.c index 373b934..c380d27 100644 --- a/arch/blackfin/lib/board.c +++ b/arch/blackfin/lib/board.c @@ -319,13 +319,8 @@ static void board_net_init_r(bd_t *bd) bb_miiphy_init(); #endif #ifdef CONFIG_CMD_NET - char *s; - - if ((s = getenv("bootfile")) != NULL) - copy_filename(BootFile, s, sizeof(BootFile)); - printf("Net: "); - eth_initialize(gd->bd); + eth_initialize(bd); #endif } diff --git a/arch/m68k/lib/board.c b/arch/m68k/lib/board.c index ffd91a8..65a8595 100644 --- a/arch/m68k/lib/board.c +++ b/arch/m68k/lib/board.c @@ -559,11 +559,6 @@ void board_init_r (gd_t *id, ulong dest_addr) /* Initialize from environment */ load_addr = getenv_ulong("loadaddr", 16, load_addr); -#if defined(CONFIG_CMD_NET) - if ((s = getenv ("bootfile")) != NULL) { - copy_filename (BootFile, s, sizeof (BootFile)); - } -#endif WATCHDOG_RESET (); diff --git a/arch/microblaze/lib/board.c b/arch/microblaze/lib/board.c index beb406d..f3679d5 100644 --- a/arch/microblaze/lib/board.c +++ b/arch/microblaze/lib/board.c @@ -182,10 +182,6 @@ void board_init (void) uchar enetaddr[6]; eth_getenv_enetaddr("ethaddr", enetaddr); printf("MAC: %pM\n", enetaddr); - - s = getenv("bootfile"); - if (s != NULL) - copy_filename(BootFile, s, sizeof(BootFile)); #endif /* main_loop */ diff --git a/arch/mips/lib/board.c b/arch/mips/lib/board.c index 84e55f2..59a8001 100644 --- a/arch/mips/lib/board.c +++ b/arch/mips/lib/board.c @@ -339,14 +339,6 @@ void board_init_r(gd_t *id, ulong dest_addr) /* Initialize from environment */ load_addr = getenv_ulong("loadaddr", 16, load_addr); -#if defined(CONFIG_CMD_NET) - { - char *s = getenv("bootfile"); - - if (s != NULL) - copy_filename(BootFile, s, sizeof(BootFile)); - } -#endif #ifdef CONFIG_CMD_SPI puts("SPI: "); diff --git a/arch/nds32/lib/board.c b/arch/nds32/lib/board.c index 50ea30d..7121313 100644 --- a/arch/nds32/lib/board.c +++ b/arch/nds32/lib/board.c @@ -399,12 +399,6 @@ void board_init_r(gd_t *id, ulong dest_addr) /* Initialize from environment */ load_addr = getenv_ulong("loadaddr", 16, load_addr); -#if defined(CONFIG_CMD_NET) - s = getenv("bootfile"); - if (s != NULL) - copy_filename(BootFile, s, sizeof(BootFile)); -#endif - #ifdef BOARD_LATE_INIT board_late_init(); #endif diff --git a/arch/powerpc/lib/board.c b/arch/powerpc/lib/board.c index 7daffce..fea310e 100644 --- a/arch/powerpc/lib/board.c +++ b/arch/powerpc/lib/board.c @@ -932,14 +932,6 @@ void board_init_r(gd_t *id, ulong dest_addr) /* Initialize from environment */ load_addr = getenv_ulong("loadaddr", 16, load_addr); -#if defined(CONFIG_CMD_NET) - { - char *s = getenv("bootfile"); - - if (s != NULL) - copy_filename(BootFile, s, sizeof(BootFile)); - } -#endif WATCHDOG_RESET(); diff --git a/arch/sh/lib/board.c b/arch/sh/lib/board.c index d71cca4..34d7881 100644 --- a/arch/sh/lib/board.c +++ b/arch/sh/lib/board.c @@ -190,15 +190,8 @@ void sh_generic_init(void) bb_miiphy_init(); #endif #if defined(CONFIG_CMD_NET) - { - char *s; - puts("Net: "); - eth_initialize(gd->bd); - - s = getenv("bootfile"); - if (s != NULL) - copy_filename(BootFile, s, sizeof(BootFile)); - } + puts("Net: "); + eth_initialize(gd->bd); #endif /* CONFIG_CMD_NET */ while (1) { diff --git a/arch/sparc/lib/board.c b/arch/sparc/lib/board.c index 9faf88b..7e48775 100644 --- a/arch/sparc/lib/board.c +++ b/arch/sparc/lib/board.c @@ -357,11 +357,6 @@ void board_init_f(ulong bootflag) /* Initialize from environment */ load_addr = getenv_ulong("loadaddr", 16, load_addr); -#if defined(CONFIG_CMD_NET) - if ((s = getenv("bootfile")) != NULL) { - copy_filename(BootFile, s, sizeof(BootFile)); - } -#endif /* CONFIG_CMD_NET */ WATCHDOG_RESET(); diff --git a/arch/x86/include/asm/init_helpers.h b/arch/x86/include/asm/init_helpers.h index 8d2e0ba..8afb443 100644 --- a/arch/x86/include/asm/init_helpers.h +++ b/arch/x86/include/asm/init_helpers.h @@ -37,7 +37,6 @@ int mem_malloc_init_r(void); int init_bd_struct_r(void); int flash_init_r(void); int status_led_set_r(void); -int set_bootfile_r(void); int set_load_addr_r(void); #endif /* !_INIT_HELPERS_H_ */ diff --git a/arch/x86/lib/board.c b/arch/x86/lib/board.c index 15b4ae2..90cf7fc 100644 --- a/arch/x86/lib/board.c +++ b/arch/x86/lib/board.c @@ -177,9 +177,6 @@ init_fnc_t *init_sequence_r[] = { status_led_set_r, #endif set_load_addr_r, -#if defined(CONFIG_CMD_NET) - set_bootfile_r, -#endif #if defined(CONFIG_CMD_IDE) ide_init_r, #endif diff --git a/arch/x86/lib/init_helpers.c b/arch/x86/lib/init_helpers.c index a8741d0..9ec34ff 100644 --- a/arch/x86/lib/init_helpers.c +++ b/arch/x86/lib/init_helpers.c @@ -188,18 +188,6 @@ int status_led_set_r(void) } #endif -int set_bootfile_r(void) -{ - char *s; - - s = getenv("bootfile"); - - if (s != NULL) - copy_filename(BootFile, s, sizeof(BootFile)); - - return 0; -} - int set_load_addr_r(void) { /* Initialize from environment */ diff --git a/net/eth.c b/net/eth.c index 35e0de6..d9a6430 100644 --- a/net/eth.c +++ b/net/eth.c @@ -245,6 +245,14 @@ int eth_unregister(struct eth_device *dev) return 0; } +static void eth_env_init(bd_t *bis) +{ + const char *s; + + if ((s = getenv("bootfile")) != NULL) + copy_filename(BootFile, s, sizeof(BootFile)); +} + int eth_initialize(bd_t *bis) { int num_devices = 0; @@ -260,6 +268,8 @@ int eth_initialize(bd_t *bis) phy_init(); #endif + eth_env_init(bis); + /* * If board-specific initialization exists, call it. * If not, call a CPU-specific one -- 2.7.4