diff options
| author | Peter Tyser <ptyser@xes-inc.com> | 2009-07-15 00:01:08 -0500 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2009-07-17 23:44:42 +0200 |
| commit | f732a7598fa36d48241df20b1a1f4cdbf09f75ee (patch) | |
| tree | 0cbcaee86aeb7bab1eceed26ef8e0c6fba34a584 /include | |
| parent | 18e067de9b6ed087fa60496e64887f0b7458dbaa (diff) | |
| download | blackbird-obmc-uboot-f732a7598fa36d48241df20b1a1f4cdbf09f75ee.tar.gz blackbird-obmc-uboot-f732a7598fa36d48241df20b1a1f4cdbf09f75ee.zip | |
ppc: Fix compile error for boards with CONFIG_DDR_ECC
A bug was introduced by commit e94e460c6e8741f42dab6d8dd4b596ba5d9d79ae
which affected non-MPC83xx/85xx/86xx ppc boards which had CONFIG_DDR_ECC
defined and resulted in errors such as:
Configuring for canyonlands board...
fsl_dma.c:50:2: error: #error "Freescale DMA engine not supported on your
processor"
make[1]: *** No rule to make target `.depend', needed by `libdma.a'. Stop.
Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-ppc/config.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/include/asm-ppc/config.h b/include/asm-ppc/config.h index ca143c7fef..c9ba805077 100644 --- a/include/asm-ppc/config.h +++ b/include/asm-ppc/config.h @@ -29,10 +29,11 @@ #endif #endif -#ifndef CONFIG_FSL_DMA -#if ((!defined CONFIG_MPC83xx && defined(CONFIG_DDR_ECC) && \ - !defined(CONFIG_ECC_INIT_VIA_DDRCONTROLLER)) || \ - (defined(CONFIG_MPC83xx) && defined(CONFIG_DDR_ECC_INIT_VIA_DMA))) +/* Check if boards need to enable FSL DMA engine for SDRAM init */ +#if !defined(CONFIG_FSL_DMA) && defined(CONFIG_DDR_ECC) +#if (defined(CONFIG_MPC83xx) && defined(CONFIG_DDR_ECC_INIT_VIA_DMA)) || \ + ((defined(CONFIG_MPC85xx) || defined(CONFIG_MPC86xx)) && \ + !defined(CONFIG_ECC_INIT_VIA_DDRCONTROLLER)) #define CONFIG_FSL_DMA #endif #endif |
