commit 4b9206ed51a3e3dc06dca2a3930a24e4f0025f3d
author wdenk <wdenk> Tue Mar 23 22:14:11 2004 +0000
committer wdenk <wdenk> Tue Mar 23 22:14:11 2004 +0000
tree 2eb73ab74a66356c52d588bb06f803af55897e18
parent 109c0e3ad32428dd65ed89f882faf59e30132494

* Patches by Thomas Viehweger, 16 Mar 2004:
  - show PCI clock frequency on MPC8260 systems
  - add FCC_PSMR_RMII flag for HiP7 processors
  - in do_jffs2_fsload(), take load address from load_addr if not set
    explicit, update load_addr otherwise
  - replaced printf by putc/puts when no formatting is needed
    (smaller code size, faster execution)

common/cmd_jffs2.c

diff --git a/common/cmd_jffs2.c b/common/cmd_jffs2.c
index 6ebd46f..c4f5a97 100644
--- a/common/cmd_jffs2.c
+++ b/common/cmd_jffs2.c
@@ -98,7 +98,7 @@
     char *fsname;
 
 	char *filename = "uImage";
-	ulong offset = CFG_LOAD_ADDR;
+	ulong offset = load_addr;
 	int size;
 	struct part_info *part;
 
@@ -107,6 +107,7 @@
 	}
 	if (argc == 3) {
 		offset = simple_strtoul(argv[1], NULL, 16);
+		load_addr = offset;
 		filename = argv[2];
 	}
 
@@ -135,7 +136,7 @@
 
 		return !(size > 0);
 	}
-	printf("Active partition not valid\n");
+	puts ("Active partition not valid\n");
 	return 0;
 }
 
@@ -164,7 +165,7 @@
 
 		return (ret == 1);
 	}
-	printf("Active partition not valid\n");
+	puts ("Active partition not valid\n");
 	return 0;
 }
 
@@ -192,7 +193,7 @@
 
 		return (ret == 1);
 	}
-	printf("Active partition not valid\n");
+	puts ("Active partition not valid\n");
 	return 0;
 }
 
@@ -206,7 +207,7 @@
    if (argc >= 2) {
 		tmp_part = simple_strtoul(argv[1], NULL, 16);
 	}else{
-		printf("Need partition number in argument list\n");
+		puts ("Need partition number in argument list\n");
 		return 0;
 
 	}