Merge branch 'u-boot-tegra/master' into 'u-boot-arm/master'

diff --git a/Makefile b/Makefile
index b2937e95e1ba15b2c42889db7dfd7a81e64302dc..c91c10ed3a33089a94fe06e6d2ebee05753111c0 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -8,7 +8,7 @@
 VERSION = 2014
 PATCHLEVEL = 04
 SUBLEVEL =
-EXTRAVERSION = -rc3
+EXTRAVERSION =
 NAME =
 
 # *DOCUMENTATION*

diff --git a/drivers/i2c/sh_i2c.c b/drivers/i2c/sh_i2c.c
index cc191007503003e12ffa46e598537e262ed15dce..e7e96921d21d6efa7ab56e6ccceb41d5f918d4ef 100644 (file)
--- a/drivers/i2c/sh_i2c.c
+++ b/drivers/i2c/sh_i2c.c
@@ -269,7 +269,9 @@ static int sh_i2c_write(struct i2c_adapter *adap, uint8_t chip, uint addr,
 static int
 sh_i2c_probe(struct i2c_adapter *adap, u8 dev)
 {
-       return sh_i2c_read(adap, dev, 0, 0, NULL, 0);
+       u8 dummy[1];
+
+       return sh_i2c_read(adap, dev, 0, 0, dummy, sizeof dummy);
 }
 
 static unsigned int sh_i2c_set_bus_speed(struct i2c_adapter *adap,

diff --git a/include/configs/kzm9g.h b/include/configs/kzm9g.h
index 4d11c7d08c09eb6a8171139d71ba85cb5ca20601..5a13ad11393d7202ecb287c337f9537ae9741e95 100644 (file)
--- a/include/configs/kzm9g.h
+++ b/include/configs/kzm9g.h
@@ -15,6 +15,7 @@
 #define CONFIG_KZM_A9_GT
 #define CONFIG_RMOBILE_BOARD_STRING    "KMC KZM-A9-GT"
 #define CONFIG_MACH_TYPE MACH_TYPE_KZM9G
+#define CONFIG_SYS_GENERIC_BOARD
 
 #include <asm/arch/rmobile.h>