Fix problems with ld version 2.16 (dot outside sections problem)

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

diff --git a/board/siemens/CCM/ccm.c b/board/siemens/CCM/ccm.c
index 079f38f7ec92655c4e9c24cff7e8e67b6c12cf59..3ed1b754ca99491eff1dc6b61c3e7ed6d38ed154 100644 (file)
--- a/board/siemens/CCM/ccm.c
+++ b/board/siemens/CCM/ccm.c
@@ -267,7 +267,7 @@ void can_driver_enable (void)
     volatile memctl8xx_t *memctl = &immap->im_memctl;
 
     /* Initialize MBMR */
-    memctl->memc_mbmr = MAMR_GPL_B4DIS;        /* GPL_B4 ouput line Disable */
+    memctl->memc_mbmr = MBMR_GPL_B4DIS;        /* GPL_B4 ouput line Disable */
 
     /* Initialize UPMB for CAN: single read */
     memctl->memc_mdr = 0xFFFFC004;
@@ -333,42 +333,10 @@ static long int dram_size (long int mamr_value, long int *base, long int maxsize
 {
     volatile immap_t     *immap  = (immap_t *)CFG_IMMR;
     volatile memctl8xx_t *memctl = &immap->im_memctl;
-    volatile long int   *addr;
-    ulong                cnt, val;
-    ulong                save[32];     /* to make test non-destructive */
-    unsigned char        i = 0;
 
     memctl->memc_mamr = mamr_value;
 
-    for (cnt = maxsize/sizeof(long); cnt > 0; cnt >>= 1) {
-       addr = base + cnt;      /* pointer arith! */
-
-       save[i++] = *addr;
-       *addr = ~cnt;
-    }
-
-    /* write 0 to base address */
-    addr = base;
-    save[i] = *addr;
-    *addr = 0;
-
-    /* check at base address */
-    if ((val = *addr) != 0) {
-       *addr = save[i];
-       return (0);
-    }
-
-    for (cnt = 1; cnt <= maxsize/sizeof(long); cnt <<= 1) {
-       addr = base + cnt;      /* pointer arith! */
-
-       val = *addr;
-       *addr = save[--i];
-
-       if (val != (~cnt)) {
-           return (cnt * sizeof(long));
-       }
-    }
-    return (maxsize);
+    return (get_ram_size(base, maxsize));
 }
 
 /* ------------------------------------------------------------------------- */
@@ -383,7 +351,7 @@ void        reset_phy(void)
        ulong value;
 
        /* Configure all needed port pins for GPIO */
-#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 | CFG_PA_ETH_RESET);    /* Set low */
@@ -401,17 +369,17 @@ void      reset_phy(void)
        value |=  CFG_PB_ETH_POWERDOWN;
 
        /* PHY configuration includes MDDIS and CFG1 ... CFG3 */
-#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);