diff options
| author | wdenk <wdenk> | 2003-03-14 20:47:52 +0000 |
|---|---|---|
| committer | wdenk <wdenk> | 2003-03-14 20:47:52 +0000 |
| commit | 06d01dbe000057e5df4af0f113242f0eba716340 (patch) | |
| tree | 9188617ad1907e44f41910b99af9bde7258338f9 /cpu/arm920t | |
| parent | 09127c60964c47621937ada7b0ccbf0c26329376 (diff) | |
| download | u-boot-imx-06d01dbe000057e5df4af0f113242f0eba716340.zip u-boot-imx-06d01dbe000057e5df4af0f113242f0eba716340.tar.gz u-boot-imx-06d01dbe000057e5df4af0f113242f0eba716340.tar.bz2 | |
* Avoid flicker on the TRAB's VFD by synchronizing the enable with
the HSYNC/VSYNC. Requires new CPLD code (Version 101 for Rev. 100
boards, version 153 for Rev. 200 boards).
* Patch by Vladimir Gurevich, 12 Mar 2003:
Fix relocation problem of statically initialized string pointers
in common/cmd_pci.c
* Patch by Kai-Uwe Blöm, 12 Mar 2003:
Cleanup & bug fixes for JFFS2 code:
- the memory mangement was broken. It caused havoc on malloc by
writing beyond the block boundaries.
- the length calculation for files was wrong, sometimes resulting
in short file reads.
- data copying now optionally takes fragment version numbers into
account, to avoid copying from older data.
See doc/README.JFFS2 for details.
Diffstat (limited to 'cpu/arm920t')
| -rw-r--r-- | cpu/arm920t/interrupts.c | 8 | ||||
| -rw-r--r-- | cpu/arm920t/start.S | 3 |
2 files changed, 8 insertions, 3 deletions
diff --git a/cpu/arm920t/interrupts.c b/cpu/arm920t/interrupts.c index 963ccbd..195fb01 100644 --- a/cpu/arm920t/interrupts.c +++ b/cpu/arm920t/interrupts.c @@ -199,9 +199,9 @@ int interrupt_init (void) /* load value for 10 ms timeout */ lastdec = rTCNTB4 = timer_load_val; /* auto load, manual update of Timer 4 */ - rTCON = 0x600000; + rTCON = (rTCON & ~0x0700000) | 0x600000; /* auto load, start Timer 4 */ - rTCON = 0x500000; + rTCON = (rTCON & ~0x0700000) | 0x500000; timestamp = 0; return (0); @@ -296,8 +296,10 @@ ulong get_tbclk (void) #if defined(CONFIG_SMDK2400) || defined(CONFIG_TRAB) tbclk = timer_load_val * 100; -#elif defined(CONFIG_SMDK2410) +#elif defined(CONFIG_SMDK2410) || defined(CONFIG_VCMA9) tbclk = CFG_HZ; +#else +# error "tbclk not configured" #endif return tbclk; diff --git a/cpu/arm920t/start.S b/cpu/arm920t/start.S index a858dfa..4a4825a 100644 --- a/cpu/arm920t/start.S +++ b/cpu/arm920t/start.S @@ -446,6 +446,9 @@ fiq: reset_cpu: #ifdef CONFIG_S3C2400 bl disable_interrupts +# ifdef CONFIG_TRAB + bl disable_vfd +# endif ldr r1, _rWTCON ldr r2, _rWTCNT /* Disable watchdog */ |