summaryrefslogtreecommitdiff
path: root/cpu
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2009-12-07 22:47:17 +0100
committerWolfgang Denk <wd@denx.de>2009-12-07 22:47:17 +0100
commit206c00f26f56af02686cb69bfe5c75e979063171 (patch)
tree4e637df34f87762a2e70649e88f52ac973df1f00 /cpu
parent39ff7d5f4cc547a2034a8bfc2a5b5f4b62fd5c20 (diff)
parentf8450829f921cf10667af98a8d08edfa3d998f04 (diff)
downloadu-boot-imx-206c00f26f56af02686cb69bfe5c75e979063171.zip
u-boot-imx-206c00f26f56af02686cb69bfe5c75e979063171.tar.gz
u-boot-imx-206c00f26f56af02686cb69bfe5c75e979063171.tar.bz2
Merge branch 'master' into next
Conflicts: lib_generic/zlib.c Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'cpu')
-rw-r--r--cpu/arm920t/s3c24x0/timer.c2
-rw-r--r--cpu/arm_cortexa8/omap3/board.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/cpu/arm920t/s3c24x0/timer.c b/cpu/arm920t/s3c24x0/timer.c
index fcc6c0c..7d47354 100644
--- a/cpu/arm920t/s3c24x0/timer.c
+++ b/cpu/arm920t/s3c24x0/timer.c
@@ -198,6 +198,8 @@ void reset_cpu(ulong ignored)
struct s3c24x0_watchdog *watchdog;
#ifdef CONFIG_TRAB
+ extern void disable_vfd(void);
+
disable_vfd();
#endif
diff --git a/cpu/arm_cortexa8/omap3/board.c b/cpu/arm_cortexa8/omap3/board.c
index dd2c940..2aa69b3 100644
--- a/cpu/arm_cortexa8/omap3/board.c
+++ b/cpu/arm_cortexa8/omap3/board.c
@@ -328,7 +328,7 @@ usage:
U_BOOT_CMD(
nandecc, 2, 1, do_switch_ecc,
- "nandecc - switch OMAP3 NAND ECC calculation algorithm\n",
+ "switch OMAP3 NAND ECC calculation algorithm",
"[hw/sw] - Switch between NAND hardware (hw) or software (sw) ecc algorithm"
);