leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

env: Add a bootfile env handler

Browse Source 
Remove the hard-coded bootfile handler and use a callback instead

Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
This commit is contained in:
Joe Hershberger 2012-12-11 22:16:26 -06:00 committed by Tom Rini
parent 5e2b3e0c59
commit a9f51c9b43
3 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
common/cmd_nvedit.c
View File

@ -50,9 +50,6 @@
#include <serial.h>
#include <linux/stddef.h>
#include <asm/byteorder.h>
#if defined(CONFIG_CMD_NET)
#include <net.h>
#endif
DECLARE_GLOBAL_DATA_PTR;
@ -328,12 +325,6 @@ int env_change_ok(const ENTRY *item, const char *newval, enum env_op op,
load_addr = simple_strtoul(newval, NULL, 16);
return 0;
}
#if defined(CONFIG_CMD_NET)
else if (strcmp(name, "bootfile") == 0) {
copy_filename(BootFile, newval, sizeof(BootFile));
return 0;
}
#endif
return 0;
}

1
include/env_callback.h
View File

@ -39,6 +39,7 @@
* a new association in the ".callbacks" environment variable.
*/
#define ENV_CALLBACK_LIST_STATIC ENV_CALLBACK_VAR ":callbacks," \
"bootfile:bootfile," \
CONFIG_ENV_CALLBACK_LIST_STATIC
struct env_clbk_tbl {

17
net/net.c
View File

@ -82,6 +82,7 @@
#include <common.h>
#include <command.h>
#include <environment.h>
#include <net.h>
#if defined(CONFIG_STATUS_LED)
#include <miiphy.h>
@ -208,6 +209,22 @@ static int NetTryCount;
/**********************************************************************/
static int on_bootfile(const char *name, const char *value, enum env_op op,
int flags)
{
switch (op) {
case env_op_create:
case env_op_overwrite:
copy_filename(BootFile, value, sizeof(BootFile));
break;
default:
break;
}
return 0;
}
U_BOOT_ENV_CALLBACK(bootfile, on_bootfile);
/*
* Check if autoload is enabled. If so, use either NFS or TFTP to download
* the boot file.