Merge with /home/tur/proj/051_uboot_linux_v38b/u-boot

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

diff --git a/board/gth/gth.c b/board/gth/gth.c
index 94e7a6543360f97d44908186630ec2c8b1e878af..b1fcbf5cc36a2f49239aaf549ee4e24506a2d9b9 100644 (file)
--- a/board/gth/gth.c
+++ b/board/gth/gth.c
@@ -218,7 +218,7 @@ int _initsdram (uint base, uint * noMbytes)
                           sizeof (fpga_table) / sizeof (uint));
 
        /* Enable UPWAITB */
-       mc->memc_mbmr = MAMR_GPL_B4DIS; /* (16-13) */
+       mc->memc_mbmr = MBMR_GPL_B4DIS; /* (16-13) */
 
        /* CS2, base FPGA_2_BASE - 4 MByte, use UPM B 32 Bit */
        mc->memc_or2 = 0xffc00000 | OR_BI;
@@ -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);
 }