minix/u-boot
1
0
Fork 0
mirror of https://github.com/Stichting-MINIX-Research-Foundation/u-boot.git synced 2025-09-10 12:39:22 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of git://git.denx.de/u-boot-imx

Browse Source
This commit is contained in:
Wolfgang Denk 2010-08-10 22:49:09 +02:00
commit b77f380115
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/cpu/armv7/mx51/timer.c
View File

@ -89,7 +89,7 @@ ulong get_timer_masked(void)
timestamp += ((0xFFFFFFFF / (CONFIG_MX51_CLK32 / CONFIG_SYS_HZ)) timestamp += ((0xFFFFFFFF / (CONFIG_MX51_CLK32 / CONFIG_SYS_HZ))
- lastinc) + val; - lastinc) + val;
lastinc = val; lastinc = val;
return val; return timestamp;
} }
ulong get_timer(ulong base) ulong get_timer(ulong base)

2
common/cmd_mmc.c
View File

@ -133,7 +133,7 @@ int do_mmcinfo (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
U_BOOT_CMD( U_BOOT_CMD(
mmcinfo, 2, 0, do_mmcinfo, mmcinfo, 2, 0, do_mmcinfo,
"display MMC info", "display MMC info",
"<dev num>\n "<dev num>\n"
" - device number of the device to dislay info of\n" " - device number of the device to dislay info of\n"
"" ""
); );