Merge branch 'master' of git://www.denx.de/git/u-boot

[u-boot] / board / gth / gth.c

diff --git a/board/gth/gth.c b/board/gth/gth.c
index 6f972ce8908785a72fe6f4d45681d0474d23b7e9..788a6a0948930a6e13ed9d26fa5275087f28c84d 100644 (file)
--- a/board/gth/gth.c
+++ b/board/gth/gth.c
@@ -265,7 +265,7 @@ int initsdram (uint base, uint * noMbytes)
 #endif
 }
 
-long int initdram (int board_type)
+phys_size_t initdram (int board_type)
 {
        u32 *i;
        u32 j;
@@ -589,7 +589,7 @@ int misc_init_r (void)
                (Rx[8] != ':') | (Rx[11] != ':') | (Rx[14] != ':')) {
                printf ("*** ethernet addr invalid, using default ***\n");
        } else {
-               setenv ("ethaddr", Rx);
+               setenv ("ethaddr", (char *)Rx);
        }
        return (0);
 }