p3mx: Remove serial relocation fixups

[u-boot] / board / prodrive / p3mx / sdram_init.c

diff --git a/board/prodrive/p3mx/sdram_init.c b/board/prodrive/p3mx/sdram_init.c
index 176252efee5ff0986cf02a9c13f735d7d39b7bb6..bac6c12b98c38c03a30520f8975cf9da782a8e44 100644 (file)
--- 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 |
@@ -160,7 +160,7 @@ long int dram_size (long int *base, long int maxsize)
 #define SDRAM_NOP                      0x5
 #define SDRAM_SELF_REFRESH             0x7
 
-long int initdram (int board_type)
+phys_size_t initdram (int board_type)
 {
        int tmp;
        int start;
@@ -243,9 +243,9 @@ long int initdram (int board_type)
        udelay(2);  /* FIXME  make this dynamic for the system clock */
 
        /* SDRAM init done */
-       memory_map_bank(0, CFG_SDRAM_BASE,  (256 << 20));
-#ifdef CFG_SDRAM1_BASE
-       memory_map_bank(1, CFG_SDRAM1_BASE, (256 << 20));
+       memory_map_bank(0, CONFIG_SYS_SDRAM_BASE,  (256 << 20));
+#ifdef CONFIG_SYS_SDRAM1_BASE
+       memory_map_bank(1, CONFIG_SYS_SDRAM1_BASE, (256 << 20));
 #endif
 
        /* DUNIT_MMASK: enable SnoopHitEn bit to avoid errata CPU-#4