#else
#define CONFIG_BOOTDELAY 0
#endif
+#define CONFIG_BOOT_RETRY_TIME -1
+#define CONFIG_BOOT_RETRY_MIN 3
+#define CONFIG_RESET_TO_RETRY
#define CONFIG_ZERO_BOOTDELAY_CHECK
#define CONFIG_SYS_AUTOLOAD "no"
#define DEFAULT_BOOTCMD "run bootcmd_${boot_mode} bootm_cmd"
"nfsroot=/tftpboot/rootfs\0" \
"otg_mode=device\0" \
ROOTPART_UUID_STR \
+ "silent=1\0" \
"touchpanel=tsc2007\0" \
"video_mode=" DEFAULT_VIDEO_MODE "\0"
#endif /* CONFIG_ENV_IS_NOWHERE */
#define CONFIG_BAUDRATE 115200 /* Default baud rate */
#define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, }
#define CONFIG_SYS_CONSOLE_INFO_QUIET
+#define CONFIG_SYS_CONSOLE_IS_IN_ENV
+#define CONFIG_SILENT_CONSOLE
+#define CONFIG_SILENT_CONSOLE_UPDATE_ON_SET
+#define CONFIG_SILENT_CONSOLE_UPDATE_ON_RELOC
+#define CONFIG_SILENT_U_BOOT_ONLY
+#define CONFIG_SYS_DEVICE_NULLDEV
#define CONFIG_CONS_INDEX 1
/*
#if defined(CONFIG_TX6_REV)
#if CONFIG_TX6_REV == 0x1
#define CONFIG_LTC3676
-#elif CONFIG_TX6_REV == 0x2
-#define CONFIG_RN5T618
#elif CONFIG_TX6_REV == 0x3
#define CONFIG_RN5T567
#else
#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 */