From a9804be86858cf7ee3e39e6a371ecd56da517ce8 Mon Sep 17 00:00:00 2001 From: Reinhard Meyer Date: Mon, 9 Aug 2010 17:30:51 +0200 Subject: [PATCH 1/2] fix cmd_mmc.c, line 136 missing " Remove warning for missing " at the end of line 136 Signed-off-by: Reinhard Meyer --- common/cmd_mmc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/cmd_mmc.c b/common/cmd_mmc.c index a6ed6a84e..c0b30d8b8 100644 --- a/common/cmd_mmc.c +++ b/common/cmd_mmc.c @@ -133,7 +133,7 @@ int do_mmcinfo (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) U_BOOT_CMD( mmcinfo, 2, 0, do_mmcinfo, "display MMC info", - "\n + "\n" " - device number of the device to dislay info of\n" "" ); From 51b5870bdc837359299d22e8af48f315bd65d5fd Mon Sep 17 00:00:00 2001 From: Li Haibo Date: Tue, 10 Aug 2010 14:18:38 +0800 Subject: [PATCH 2/2] MX51EVK: fix return value of get_timer_masked get_timer_masked() should return current timestamp, not current ticks from hardware register. Tested on one custom board with NAND flash. Without this patch, NAND write always TIMEOUT because get_timer(0) return a big value. This patch applies for u-boot-2010.06 Signed-off-by: Li Haibo --- arch/arm/cpu/armv7/mx51/timer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/cpu/armv7/mx51/timer.c b/arch/arm/cpu/armv7/mx51/timer.c index 81c4a0614..110edbfa8 100644 --- a/arch/arm/cpu/armv7/mx51/timer.c +++ b/arch/arm/cpu/armv7/mx51/timer.c @@ -89,7 +89,7 @@ ulong get_timer_masked(void) timestamp += ((0xFFFFFFFF / (CONFIG_MX51_CLK32 / CONFIG_SYS_HZ)) - lastinc) + val; lastinc = val; - return val; + return timestamp; } ulong get_timer(ulong base)