From de30122bb58fee7b0f94bcfabab595b6ad757336 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Wed, 4 Apr 2012 18:53:41 +0000 Subject: 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/x86/include/asm/init_helpers.h | 1 - arch/x86/lib/board.c | 3 --- arch/x86/lib/init_helpers.c | 12 ------------ 3 files changed, 16 deletions(-) (limited to 'arch/x86') diff --git a/arch/x86/include/asm/init_helpers.h b/arch/x86/include/asm/init_helpers.h index 8d2e0bae2f..8afb443290 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 15b4ae2e71..90cf7fc888 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 a8741d0e63..9ec34ff992 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 */ -- cgit v1.2.1