From f39748ae8edb03017647b0d731cdd06e7bdcde13 Mon Sep 17 00:00:00 2001
From: wdenk <wdenk>
Date: Wed, 9 Jun 2004 13:37:52 +0000
Subject: * Patch by Paul Ruhland, 17 May 2004:   - Add support for the Logic
 Zoom LH7A40x based SDK board(s),     specifically the LPD7A400.

* Patches by Robert Schwebel, 15 May 2004:
  - call MAC address reading code also for SMSC91C111;
  - make SMSC91C111 timeout configurable, remove duplicate code
  - fix get_timer() for PXA
  - update doc/README.JFFS2
  - use "bootfile" env variable also for jffs2
---
 common/cmd_jffs2.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'common/cmd_jffs2.c')

diff --git a/common/cmd_jffs2.c b/common/cmd_jffs2.c
index 085781f74..207c211e8 100644
--- a/common/cmd_jffs2.c
+++ b/common/cmd_jffs2.c
@@ -126,7 +126,13 @@ do_jffs2_fsload(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
     int jffs2_1pass_load(char *, struct part_info *,const char *);
     char *fsname;
 
-	char *filename = "uImage";
+	char *filename;
+
+	/* pre-set Boot file name */
+	if ((filename = getenv("bootfile")) == NULL) {
+		filename = "uImage";
+	}
+
 	ulong offset = load_addr;
 	int size;
 	struct part_info *part;
-- 
cgit v1.2.3