Merge branch 'tx6-bugfix'

diff --combined include/configs/tx6.h
index 8b1b05be803d1dd3e4c138c78bb444fee0ff90b8,e4a2a6c88eac0132deee8107314e0d825e3e7db9..dcd36decc742631644e5d3583652b0b77a92e103
--- 1/include/configs/tx6.h
--- 2/include/configs/tx6.h
+++ b/include/configs/tx6.h
@@@ -43,6 -43,7 +43,6 @@@
  #define CONFIG_SYS_GENERIC_BOARD
  #define CONFIG_CMD_GPIO
  
 -#ifndef CONFIG_TX6_UBOOT_MFG
  /* LCD Logo and Splash screen support */
  #ifdef CONFIG_LCD
  #define CONFIG_SPLASH_SCREEN
@@@ -63,6 -64,7 +63,6 @@@
  #define CONFIG_BMP_32BPP
  #define CONFIG_VIDEO_BMP_RLE8
  #endif /* CONFIG_LCD */
 -#endif /* CONFIG_TX6_UBOOT_MFG */
  
  /*
   * Memory configuration options
@@@ -182,7 -184,7 +182,7 @@@
  #endif
  
  /*
 - * Extra Environments
 + * Extra Environment Settings
   */
  #ifdef CONFIG_TX6_UBOOT_NOENV
  #define CONFIG_EXTRA_ENV_SETTINGS                                     \
@@@ -317,22 -319,21 +317,21 @@@
  #error Unsupported TX6 module revision
  #endif
  #else /* CONFIG_TX6_REV */
- /* autodetect which PMIC is present to derive TX6_REV */
  #ifdef CONFIG_SOC_MX6UL
- #ifndef CONFIG_TX6_UBOOT_NOENV
+ #ifdef CONFIG_SYS_I2C_SOFT
  /* NOENV U-Boot is used for initial bootstrap.
   * Since the TAMPER_PIN_DISABLE fuses have to be programmed
   * to be able to use the TAMPER pins as GPIO to access the
   * PMIC I2C bus, this is not possible on virgin hardware.
   */
- #define CONFIG_SYS_I2C
- #define CONFIG_SYS_I2C_SOFT
  #define CONFIG_SYS_I2C_SOFT_SPEED     400000
+ #define CONFIG_SYS_I2C_SPEED          CONFIG_SYS_I2C_SOFT_SPEED
  #define CONFIG_SOFT_I2C_GPIO_SCL      IMX_GPIO_NR(5, 0)
  #define CONFIG_SOFT_I2C_GPIO_SDA      IMX_GPIO_NR(5, 1)
  #define CONFIG_SOFT_I2C_READ_REPEATED_START
- #endif /* CONFIG_TX6_UBOOT_NOENV */
+ #endif /* CONFIG_SYS_I2C_SOFT */
  #else /* !CONFIG_SOC_MX6UL */
+ /* autodetect which PMIC is present to derive TX6_REV */
  #define CONFIG_LTC3676                        /* TX6_REV == 1 */
  #endif /*  CONFIG_SOC_MX6UL */
  #define CONFIG_RN5T567                        /* TX6_REV == 3 */