diff options
| author | Michael Brandt <Michael.Brandt@stericsson.com> | 2009-12-08 15:10:33 +0100 |
|---|---|---|
| committer | Michael Brandt <Michael.Brandt@stericsson.com> | 2009-12-08 15:10:33 +0100 |
| commit | 9b223555aa390e9a33ee8d4bbd2865fd1fbae9f7 (patch) | |
| tree | c9ef5f250ec76cda491b1dd6704d317448df3958 /cpu | |
| parent | ecde8243a8351725ff598f42c88ded154f8a0f1e (diff) | |
| parent | 0fc52948bda0734431cb528ee4fd82f1dec8c7b5 (diff) | |
Merge branch 'master' of http://git.denx.de/u-boot
Diffstat (limited to 'cpu')
| -rw-r--r-- | cpu/arm920t/s3c24x0/timer.c | 2 | ||||
| -rw-r--r-- | cpu/arm_cortexa8/omap3/board.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/cpu/arm920t/s3c24x0/timer.c b/cpu/arm920t/s3c24x0/timer.c index 20cedd463..a27f0e273 100644 --- a/cpu/arm920t/s3c24x0/timer.c +++ b/cpu/arm920t/s3c24x0/timer.c @@ -205,6 +205,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 dd2c94073..2aa69b383 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" ); |