diff options
| author | Allen Martin <amartin@nvidia.com> | 2012-12-19 13:02:36 -0800 | 
|---|---|---|
| committer | Allen Martin <amartin@nvidia.com> | 2012-12-19 13:02:36 -0800 | 
| commit | a098cf41fdb2a6607c675f7fe4f3164617c9367e (patch) | |
| tree | b37acb36f65909e6f74cc537d73efd883a1485a6 /fs/fs.c | |
| parent | b8a7c467960ffb4d5a5e1eef5f7783fb6f594542 (diff) | |
| parent | 095728803eedfce850a2f85828f79500cb09979e (diff) | |
| download | olio-uboot-2014.01-a098cf41fdb2a6607c675f7fe4f3164617c9367e.tar.xz olio-uboot-2014.01-a098cf41fdb2a6607c675f7fe4f3164617c9367e.zip | |
Merge remote-tracking branch 'u-boot/master' into u-boot-arm-merged
Conflicts:
	README
	arch/arm/cpu/armv7/exynos/clock.c
	board/samsung/universal_c210/universal.c
	drivers/misc/Makefile
	drivers/power/power_fsl.c
	include/configs/mx35pdk.h
	include/configs/mx53loco.h
	include/configs/seaboard.h
Diffstat (limited to 'fs/fs.c')
| -rw-r--r-- | fs/fs.c | 11 | 
1 files changed, 10 insertions, 1 deletions
| @@ -257,6 +257,7 @@ int do_load(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[],  	unsigned long pos;  	int len_read;  	char buf[12]; +	unsigned long time;  	if (argc < 2)  		return CMD_RET_USAGE; @@ -293,11 +294,19 @@ int do_load(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[],  	else  		pos = 0; +	time = get_timer(0);  	len_read = fs_read(filename, addr, pos, bytes); +	time = get_timer(time);  	if (len_read <= 0)  		return 1; -	printf("%d bytes read\n", len_read); +	printf("%d bytes read in %lu ms", len_read, time); +	if (time > 0) { +		puts(" ("); +		print_size(len_read / time * 1000, "/s"); +		puts(")"); +	} +	puts("\n");  	sprintf(buf, "0x%x", len_read);  	setenv("filesize", buf); |