diff options
| author | wdenk <wdenk> | 2003-07-27 00:21:01 +0000 |
|---|---|---|
| committer | wdenk <wdenk> | 2003-07-27 00:21:01 +0000 |
| commit | 1f4bb37d6bcae59b18a2438f3cdca6545a831ab5 (patch) | |
| tree | 7497d21e26ef058a329444c5703317148d7f9d69 /cpu | |
| parent | 7784674852c66b0924bdc79062bd208aa51fd0a9 (diff) | |
| download | blackbird-obmc-uboot-1f4bb37d6bcae59b18a2438f3cdca6545a831ab5.tar.gz blackbird-obmc-uboot-1f4bb37d6bcae59b18a2438f3cdca6545a831ab5.zip | |
* Patch by Scott McNutt, 21 Jul 2003:
Add support for LynuxWorks Kernel Downloadable Images (KDIs).
Both LynxOS and BlueCat linux KDIs are supported.
* Patch by Richard Woodruff, 25 Jul 2003:
use more reliable reset for OMAP/925T
* Patch by Nye Liu, 25 Jul 2003:
fix typo in mpc8xx.h
* Patch by Richard Woodruff, 24 Jul 2003:
Fixes for cmd_nand.c:
- Fixed null dereferece which could result in incorrect ECC values.
- Added support for devices with no Ready/Busy signal hooked up.
- Added OMAP1510 read/write protect handling.
- Fixed nand.h's ECCPOS. A conflict existed with POS5 and badblock
for non-JFFS2.
- Switched default ECC to be JFFS2.
Diffstat (limited to 'cpu')
| -rw-r--r-- | cpu/arm925t/start.S | 7 | ||||
| -rw-r--r-- | cpu/mpc8xx/start.S | 4 |
2 files changed, 5 insertions, 6 deletions
diff --git a/cpu/arm925t/start.S b/cpu/arm925t/start.S index a9241bcb86..e8353f2a64 100644 --- a/cpu/arm925t/start.S +++ b/cpu/arm925t/start.S @@ -413,10 +413,9 @@ fiq: .globl reset_cpu reset_cpu: ldr r1, rstctl1 /* get clkm1 reset ctl */ - mov r3, #0x0 - strh r3, [r1] /* clear it */ - mov r3, #0x8 - strh r3, [r1] /* force dsp+arm reset */ + mov r3, #0x3 /* dsp_en + arm_rst = global reset */ + strh r3, [r1] /* force reset */ + mov r0, r0 _loop_forever: b _loop_forever rstctl1: diff --git a/cpu/mpc8xx/start.S b/cpu/mpc8xx/start.S index 893c0f810f..cdd549fc74 100644 --- a/cpu/mpc8xx/start.S +++ b/cpu/mpc8xx/start.S @@ -76,7 +76,7 @@ GOT_ENTRY(__init_end) GOT_ENTRY(_end) GOT_ENTRY(__bss_start) -#if defined(CONFIG_FADS) || defined(CONFIG_ICU862) +#if defined(CONFIG_ICU862) GOT_ENTRY(environment) #endif END_GOT @@ -617,7 +617,7 @@ clear_bss: * Now clear BSS segment */ lwz r3,GOT(__bss_start) -#if defined(CONFIG_FADS) || defined(CONFIG_ICU862) +#if defined(CONFIG_ICU862) /* * For the FADS - the environment is the very last item in flash. * The real .bss stops just before environment starts, so only |
