diff options
| author | Andy Fleming <afleming@freescale.com> | 2008-10-27 17:31:05 -0500 |
|---|---|---|
| committer | Andrew Fleming-AFLEMING <afleming@freescale.com> | 2008-10-27 17:31:05 -0500 |
| commit | 16263ffd3c6d77645891bfd1b311713d936771f1 (patch) | |
| tree | cc6aaad431b70fe89a7541e627fdf96dd3df40cf /cpu | |
| parent | 4442f45b0e1cbad35aa22d4cad22b90a57e3f32d (diff) | |
| parent | f8030519bbe20b836f3939742b959cbadfaad51b (diff) | |
| download | u-boot-imx-16263ffd3c6d77645891bfd1b311713d936771f1.zip u-boot-imx-16263ffd3c6d77645891bfd1b311713d936771f1.tar.gz u-boot-imx-16263ffd3c6d77645891bfd1b311713d936771f1.tar.bz2 | |
Merge branch 'denx'
Diffstat (limited to 'cpu')
| -rw-r--r-- | cpu/ppc4xx/start.S | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cpu/ppc4xx/start.S b/cpu/ppc4xx/start.S index 31902a0..882ef21 100644 --- a/cpu/ppc4xx/start.S +++ b/cpu/ppc4xx/start.S @@ -918,7 +918,8 @@ _start: ori r4, r4, CONFIG_SYS_DCACHE_SACR_VALUE@l mtdccr r4 -#if !(defined(CONFIG_SYS_EBC_PB0AP) && defined(CONFIG_SYS_EBC_PB0CR)) +#if !(defined(CONFIG_SYS_EBC_PB0AP) && defined(CONFIG_SYS_EBC_PB0CR))\ + && !defined (CONFIG_XILINX_405) /*----------------------------------------------------------------------- */ /* Tune the speed and size for flash CS0 */ /*----------------------------------------------------------------------- */ |