Merge with /home/hs/U-Boot/u-boot-dev

[u-boot] / cpu / ppc4xx / i2c.c

diff --git a/cpu/ppc4xx/i2c.c b/cpu/ppc4xx/i2c.c
index 099d30a056daf82e7b052f81b789059555b6201f..7db1cd8046b3c29d7fd5693faaa35208c0242072 100644 (file)
--- a/cpu/ppc4xx/i2c.c
+++ b/cpu/ppc4xx/i2c.c
@@ -16,6 +16,8 @@
 
 #ifdef CONFIG_HARD_I2C
 
+DECLARE_GLOBAL_DATA_PTR;
+
 #define IIC_OK         0
 #define IIC_NOK                1
 #define IIC_NOK_LA     2               /* Lost arbitration */
@@ -380,7 +382,8 @@ int i2c_read (uchar chip, uint addr, int alen, uchar * buffer, int len)
                chip |= ((addr >> (alen * 8)) & CFG_I2C_EEPROM_ADDR_OVERFLOW);
 #endif
        if( (ret = i2c_transfer( 1, chip<<1, &xaddr[4-alen], alen, buffer, len )) != 0) {
-               printf( "I2c read: failed %d\n", ret);
+               if (gd->have_console)
+                       printf( "I2c read: failed %d\n", ret);
                return 1;
        }
        return 0;
@@ -426,7 +429,7 @@ int i2c_write (uchar chip, uint addr, int alen, uchar * buffer, int len)
  */
 uchar i2c_reg_read(uchar i2c_addr, uchar reg)
 {
-       char buf;
+       uchar buf;
 
        i2c_read(i2c_addr, reg, 1, &buf, 1);