85xx: Socrates: Major code update.

[oweals/u-boot.git] / board / siemens / pcu_e / pcu_e.c

diff --git a/board/siemens/pcu_e/pcu_e.c b/board/siemens/pcu_e/pcu_e.c
index 033cc368de0b8c57f9ff08e63230aa1ded91802d..5647f7af04f799e605d381621a2723366c17eaa0 100644 (file)
--- a/board/siemens/pcu_e/pcu_e.c
+++ b/board/siemens/pcu_e/pcu_e.c
@@ -156,7 +156,7 @@ int checkboard (void)
 
 /* ------------------------------------------------------------------------- */
 
-long int initdram (int board_type)
+phys_size_t initdram (int board_type)
 {
        volatile immap_t *immr = (immap_t *) CFG_IMMR;
        volatile memctl8xx_t *memctl = &immr->im_memctl;
@@ -241,9 +241,9 @@ long int initdram (int board_type)
         * Check Bank 0 Memory Size for re-configuration
         */
 #if PCU_E_WITH_SWAPPED_CS      /* XXX */
-       size_b0 = dram_size (CFG_MAMR, (ulong *) SDRAM_BASE5_PRELIM, SDRAM_MAX_SIZE);
+       size_b0 = dram_size (CFG_MAMR, (long *) SDRAM_BASE5_PRELIM, SDRAM_MAX_SIZE);
 #else  /* XXX */
-       size_b0 = dram_size (CFG_MAMR, (ulong *) SDRAM_BASE2_PRELIM, SDRAM_MAX_SIZE);
+       size_b0 = dram_size (CFG_MAMR, (long *) SDRAM_BASE2_PRELIM, SDRAM_MAX_SIZE);
 #endif /* XXX */
 
        memctl->memc_mamr = CFG_MAMR | MAMR_PTAE;
@@ -309,7 +309,7 @@ void reset_phy (void)
 
        /* Configure all needed port pins for GPIO */
 #if PCU_E_WITH_SWAPPED_CS      /* XXX */
-# if CFG_ETH_MDDIS_VALUE
+# ifdef CFG_ETH_MDDIS_VALUE
        immr->im_ioport.iop_padat |= CFG_PA_ETH_MDDIS;
 # else
        immr->im_ioport.iop_padat &= ~(CFG_PA_ETH_MDDIS);       /* Set low */
@@ -329,23 +329,23 @@ void reset_phy (void)
 
        /* PHY configuration includes MDDIS and CFG1 ... CFG3 */
 #if !PCU_E_WITH_SWAPPED_CS
-# if CFG_ETH_MDDIS_VALUE
+# ifdef CFG_ETH_MDDIS_VALUE
        value |= CFG_PB_ETH_MDDIS;
 # else
        value &= ~(CFG_PB_ETH_MDDIS);
 # endif
 #endif
-#if CFG_ETH_CFG1_VALUE
+#ifdef CFG_ETH_CFG1_VALUE
        value |= CFG_PB_ETH_CFG1;
 #else
        value &= ~(CFG_PB_ETH_CFG1);
 #endif
-#if CFG_ETH_CFG2_VALUE
+#ifdef CFG_ETH_CFG2_VALUE
        value |= CFG_PB_ETH_CFG2;
 #else
        value &= ~(CFG_PB_ETH_CFG2);
 #endif
-#if CFG_ETH_CFG3_VALUE
+#ifdef CFG_ETH_CFG3_VALUE
        value |= CFG_PB_ETH_CFG3;
 #else
        value &= ~(CFG_PB_ETH_CFG3);
@@ -368,7 +368,7 @@ void reset_phy (void)
 /*-----------------------------------------------------------------------
  * Board Special Commands: access functions for "PUMA" FPGA
  */
-#if (CONFIG_COMMANDS & CFG_CMD_BSP)
+#if defined(CONFIG_CMD_BSP)
 
 #define        PUMA_READ_MODE  0
 #define PUMA_LOAD_MODE 1
@@ -408,7 +408,7 @@ U_BOOT_CMD (puma, 4, 1, do_puma,
            "status - print PUMA status\n"
            "puma load addr len - load PUMA configuration data\n");
 
-#endif /* CFG_CMD_BSP */
+#endif
 
 /* . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . */