From: Lothar Waßmann <LW@KARO-electronics.de>
Date: Mon, 24 Aug 2015 11:45:51 +0000 (+0200)
Subject: Merge branch 'karo-tx-uboot' into kc-merge
X-Git-Tag: KARO-TX6-2015-09-18~4034
X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-uboot.git;a=commitdiff_plain;h=3d5920a31bb846249385e1ca5c086662c39bc44e;hp=e5bfa321e40ee65bbcfee24f6b9456609ed6ba83

Merge branch 'karo-tx-uboot' into kc-merge

Conflicts:
	board/karo/common/mmc.c
	board/karo/tx6/Makefile
	board/karo/tx6/pmic.c
	board/karo/tx6/pmic.h
	board/karo/tx6/tx6qdl.c
	boards.cfg
	include/configs/tx6.h
---

diff --git a/board/karo/tx51/tx51.c b/board/karo/tx51/tx51.c
index ec0995117e..6bb463243a 100644
--- a/board/karo/tx51/tx51.c
+++ b/board/karo/tx51/tx51.c
@@ -476,10 +476,12 @@ int board_eth_init(bd_t *bis)
 	/* Deassert RESET to the external phy */
 	gpio_set_value(TX51_FEC_RST_GPIO, 1);
 
-	/* Without this delay the PHY won't work, though nothing in
-	 * the datasheets suggests that it should be necessary!
+	/*
+	 * Due to an RC-filter in the PHY RESET line, a minimum
+	 * delay of 535us is required to let the RESET line rise
+	 * above the logic high threshold of the PHY input pin.
 	 */
-	udelay(400);
+	udelay(550);
 	imx_iomux_v3_setup_multiple_pads(tx51_fec_pads,
 					ARRAY_SIZE(tx51_fec_pads));
 
diff --git a/include/configs/tx6.h b/include/configs/tx6.h
index 1ae299c2cc..4e009fed3d 100644
--- a/include/configs/tx6.h
+++ b/include/configs/tx6.h
@@ -117,12 +117,14 @@
 #endif
 #define CONFIG_ZERO_BOOTDELAY_CHECK
 #define CONFIG_SYS_AUTOLOAD		"no"
+#define DEFAULT_BOOTCMD			"run bootcmd_${boot_mode} bootm_cmd"
 #ifndef CONFIG_TX6_UBOOT_MFG
 #define CONFIG_BOOTFILE			"uImage"
 #define CONFIG_BOOTARGS			"init=/linuxrc console=ttymxc0,115200 ro debug panic=1"
-#define CONFIG_BOOTCOMMAND		"run bootcmd_${boot_mode} bootm_cmd"
+#define CONFIG_BOOTCOMMAND		DEFAULT_BOOTCMD
 #else
-#define CONFIG_BOOTCOMMAND		"env import " xstr(CONFIG_BOOTCMD_MFG_LOADADDR) ";run bootcmd_mfg"
+#define CONFIG_BOOTCOMMAND		"set bootcmd '" DEFAULT_BOOTCMD "';" \
+	"env import " xstr(CONFIG_BOOTCMD_MFG_LOADADDR) ";run bootcmd_mfg"
 #define CONFIG_BOOTCMD_MFG_LOADADDR	10500000
 #define CONFIG_DELAY_ENVIRONMENT
 #endif /* CONFIG_TX6_UBOOT_MFG */