summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoe Hershberger <joe.hershberger@ni.com>2012-12-11 22:16:26 -0600
committerTom Rini <trini@ti.com>2012-12-13 11:46:55 -0700
commita9f51c9b4315f699e7185c85d1d09d2d7819a4eb (patch)
treea4ed6c3085eea661f229595001ce6c3d710fbf68
parent5e2b3e0c59df3313254941b453ffeadba9e673ae (diff)
downloadblackbird-obmc-uboot-a9f51c9b4315f699e7185c85d1d09d2d7819a4eb.tar.gz
blackbird-obmc-uboot-a9f51c9b4315f699e7185c85d1d09d2d7819a4eb.zip
env: Add a bootfile env handler
Remove the hard-coded bootfile handler and use a callback instead Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
-rw-r--r--common/cmd_nvedit.c9
-rw-r--r--include/env_callback.h1
-rw-r--r--net/net.c17
3 files changed, 18 insertions, 9 deletions
diff --git a/common/cmd_nvedit.c b/common/cmd_nvedit.c
index 1e51b9d069..874baef865 100644
--- a/common/cmd_nvedit.c
+++ b/common/cmd_nvedit.c
@@ -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;
}
diff --git a/include/env_callback.h b/include/env_callback.h
index 5a460f3532..bce01362ce 100644
--- a/include/env_callback.h
+++ b/include/env_callback.h
@@ -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 {
diff --git a/net/net.c b/net/net.c
index da68a61d63..a40cde1e94 100644
--- a/net/net.c
+++ b/net/net.c
@@ -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.
OpenPOWER on IntegriCloud