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

[u-boot] / include / configs / tricorder.h

diff --git a/include/configs/tricorder.h b/include/configs/tricorder.h
index bcb0350b8c740b747606c5d07ab800fc2b1e414e..ebd7a257f36a001e78f2c14968e6e51d3ec4a437 100644 (file)
--- a/include/configs/tricorder.h
+++ b/include/configs/tricorder.h
@@ -98,8 +98,6 @@
 #define CONFIG_HARD_I2C
 #define CONFIG_SYS_I2C_SPEED           100000
 #define CONFIG_SYS_I2C_SLAVE           1
-#define CONFIG_SYS_I2C_BUS             0
-#define CONFIG_SYS_I2C_BUS_SELECT      1
 #define CONFIG_DRIVER_OMAP34XX_I2C     1
 
 /* TWL4030 */
@@ -195,7 +193,7 @@
                "bootm ${loadaddr}\0" \
        "loaduimage_ubi=mtd default; " \
                "ubi part fs; " \
-               "ubifsmount root; " \
+               "ubifsmount ubi:root; " \
                "ubifsload ${loadaddr} /boot/uImage\0" \
        "nandboot=echo Booting from nand ...; " \
                "run nandargs; " \