summaryrefslogtreecommitdiff
path: root/arch/x86/lib
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2012-04-04 18:53:41 +0000
committerJoe Hershberger <joe.hershberger@ni.com>2012-05-15 17:32:33 -0500
commitde30122bb58fee7b0f94bcfabab595b6ad757336 (patch)
treee109b8799a2fe97e49424bec56cbe448154d1dd4 /arch/x86/lib
parent50a47d0523e8efebe912bef539a77ffd42116451 (diff)
downloadu-boot-imx-de30122bb58fee7b0f94bcfabab595b6ad757336.zip
u-boot-imx-de30122bb58fee7b0f94bcfabab595b6ad757336.tar.gz
u-boot-imx-de30122bb58fee7b0f94bcfabab595b6ad757336.tar.bz2
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 <vapier@gentoo.org> Reviewed-by: Joe Hershberger <joe.hershberger@ni.com>
Diffstat (limited to 'arch/x86/lib')
-rw-r--r--arch/x86/lib/board.c3
-rw-r--r--arch/x86/lib/init_helpers.c12
2 files changed, 0 insertions, 15 deletions
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 */