diff options
| author | roy zang <tie-fei.zang@freescale.com> | 2007-01-22 13:15:35 +0800 |
|---|---|---|
| committer | Zang Tiefei <roy@bus.ap.freescale.net> | 2007-01-22 13:15:35 +0800 |
| commit | ee460917afb74767aedc3da095d4fec4a50ba6f8 (patch) | |
| tree | fdead38c4681fc9adbedd6836792660f933614d3 /board/prodrive/p3mx/sdram_init.c | |
| parent | a41969e09b9d886091a804c2ba5f1ab84b084dd3 (diff) | |
| parent | a4012396645533aef218354eeba754dff0deace8 (diff) | |
Merge branch 'master' into hpc2
Conflicts:
drivers/cfi_flash.c
The patch by Heiko Schocher <hs@pollux.denx.de> on Jan, 19, 2007
fixes cfi_driver bug for mpc7448hpc2 board. The default cfi_driver can support
mpc7448hpc2 board.
Diffstat (limited to 'board/prodrive/p3mx/sdram_init.c')
| -rw-r--r-- | board/prodrive/p3mx/sdram_init.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/board/prodrive/p3mx/sdram_init.c b/board/prodrive/p3mx/sdram_init.c index 176252efee5..0464860424e 100644 --- a/board/prodrive/p3mx/sdram_init.c +++ b/board/prodrive/p3mx/sdram_init.c @@ -65,7 +65,7 @@ int mvDmaTransfer (int, ulong, ulong, ulong, ulong); int memory_map_bank (unsigned int bankNo, unsigned int bankBase, unsigned int bankLength) { -#ifdef MAP_PCI +#if defined (MAP_PCI) && defined (CONFIG_PCI) PCI_HOST host; #endif @@ -80,7 +80,7 @@ int memory_map_bank (unsigned int bankNo, memoryMapBank (bankNo, bankBase, bankLength); -#ifdef MAP_PCI +#if defined (MAP_PCI) && defined (CONFIG_PCI) for (host = PCI_HOST0; host <= PCI_HOST1; host++) { const int features = PREFETCH_ENABLE | |