Change initdram() return type to phys_size_t

[oweals/u-boot.git] / board / ppmc8260 / ppmc8260.c

diff --git a/board/ppmc8260/ppmc8260.c b/board/ppmc8260/ppmc8260.c
index ab32622c20532a03ac752ca8506e8c80a04f5bac..f3c85096b3fa4005da5f2dfe3739e45d6d3abb06 100644 (file)
--- a/board/ppmc8260/ppmc8260.c
+++ b/board/ppmc8260/ppmc8260.c
@@ -42,7 +42,7 @@ const iop_conf_t iop_conf_tab[4][32] = {
 
     /* Port A configuration */
     {  /*            conf ppar psor pdir podr pdat */
-        /* PA31 */ {   0,   0,   0,   0,   0,   0   }, /* FCC1 *ATMTXEN */
+       /* PA31 */ {   0,   0,   0,   0,   0,   0   }, /* FCC1 *ATMTXEN */
        /* PA30 */ {   0,   0,   0,   0,   0,   0   }, /* FCC1 ATMTCA   */
        /* PA29 */ {   0,   0,   0,   0,   0,   0   }, /* FCC1 ATMTSOC  */
        /* PA28 */ {   0,   0,   0,   0,   0,   0   }, /* FCC1 *ATMRXEN */
@@ -199,7 +199,7 @@ int checkboard (void)
 
 /* ------------------------------------------------------------------------- */
 
-long int initdram (int board_type)
+phys_size_t initdram (int board_type)
 {
        volatile immap_t *immap = (immap_t *) CFG_IMMR;
        volatile memctl8260_t *memctl = &immap->im_memctl;
@@ -285,7 +285,7 @@ int misc_init_r (void)
        int res;
 
        if ((ds != 0) && (ds != 0xff)) {
-               res = getenv_r ("ethaddr", tmp, sizeof (tmp));
+               res = getenv_r ("ethaddr", (char *)tmp, sizeof (tmp));
                if (res > 0) {
                        ss = ((ds >> 4) & 0x0f);
                        ss += ss < 0x0a ? '0' : ('a' - 10);
@@ -296,7 +296,7 @@ int misc_init_r (void)
                        tmp[16] = ss;
 
                        tmp[17] = '\0';
-                       setenv ("ethaddr", tmp);
+                       setenv ("ethaddr", (char *)tmp);
                        /* set the led to show the address */
                        *((unsigned char *) (CFG_LED_BASE + 1)) = ds;
                }