ENGR00118978: Timer adjustment for all platforms

In current u-boot design,
get_timer_masked is not correct and udelay is not accurate
when the time is less than 1000us.
Thus we need to use ipg clock source for accurate timer.

Signed-off-by: Terry Lv <r65388@freescale.com>

7 files changed, 22 insertions, 16 deletions

diff --git a/include/configs/mx25_3stack.h b/include/configs/mx25_3stack.h
index aa24d53..5763b24 100644
--- a/include/configs/mx25_3stack.h
+++ b/include/configs/mx25_3stack.h
@@ -100,12 +100,11 @@
 /* #define CONFIG_CMD_SPI */
 /* #define CONFIG_CMD_DATE */
 #define CONFIG_CMD_NAND
-/* #define CONFIG_CMD_MMC */
+#define CONFIG_CMD_MMC
 
 /*
  * MMC Configs
  * */
-/*
 #ifdef CONFIG_CMD_MMC
 	#define CONFIG_MMC				1
 	#define CONFIG_GENERIC_MMC
@@ -113,7 +112,6 @@
 	#define CONFIG_DOS_PARTITION	1
 	#define CONFIG_CMD_FAT		1
 #endif
-*/
 
 /* Disabled due to compilation errors in cmd_bootm.c (IMLS seems to require
  * that CONFIG_NO_FLASH is undefined).
@@ -145,6 +143,7 @@
 
 #define CONFIG_HAS_ETH1
 #define CONFIG_CMD_NET
+#define CONFIG_NET_RETRY_COUNT	100
 #define CONFIG_CMD_DHCP
 #define CONFIG_NET_MULTI
 #define CONFIG_ETH_PRIME
@@ -175,7 +174,7 @@
 
 #define CONFIG_SYS_LOAD_ADDR	CONFIG_LOADADDR /* default load address */
 
-#define CONFIG_SYS_HZ		CONFIG_MX25_CLK32
+#define CONFIG_SYS_HZ			1000
 
 #define UBOOT_IMAGE_SIZE	0x40000
 
diff --git a/include/configs/mx35_3stack.h b/include/configs/mx35_3stack.h
index 7b3f1db..f0d3d63 100644
--- a/include/configs/mx35_3stack.h
+++ b/include/configs/mx35_3stack.h
@@ -31,7 +31,6 @@
 #define CONFIG_MXC		1
 #define CONFIG_MX35		1	/* in a mx31 */
 #define CONFIG_MX35_HCLK_FREQ	24000000	/* RedBoot says 26MHz */
-#define CONFIG_MX35_CLK32	32768
 
 #define CONFIG_DISPLAY_CPUINFO
 #define CONFIG_DISPLAY_BOARDINFO
@@ -91,6 +90,7 @@
 #define CONFIG_CMD_I2C
 #define CONFIG_CMD_MII
 #define CONFIG_CMD_NET
+#define CONFIG_NET_RETRY_COUNT	100
 
 #define CONFIG_BOOTDELAY	3
 
@@ -164,7 +164,7 @@
 
 #define CONFIG_SYS_LOAD_ADDR		CONFIG_LOADADDR
 
-#define CONFIG_SYS_HZ		CONFIG_MX35_CLK32/* use 32kHz clock as source */
+#define CONFIG_SYS_HZ				1000
 
 #define CONFIG_CMDLINE_EDITING	1
 
diff --git a/include/configs/mx35_3stack_mmc.h b/include/configs/mx35_3stack_mmc.h
index 27b45c8..948bc91 100644
--- a/include/configs/mx35_3stack_mmc.h
+++ b/include/configs/mx35_3stack_mmc.h
@@ -31,7 +31,6 @@
 #define CONFIG_MXC		1
 #define CONFIG_MX35		1	/* in a mx31 */
 #define CONFIG_MX35_HCLK_FREQ	24000000	/* RedBoot says 26MHz */
-#define CONFIG_MX35_CLK32	32768
 
 #define CONFIG_DISPLAY_CPUINFO
 #define CONFIG_DISPLAY_BOARDINFO
@@ -91,6 +90,8 @@
 
 #define CONFIG_CMD_I2C
 #define CONFIG_CMD_MII
+#define CONFIG_CMD_NET
+#define CONFIG_NET_RETRY_COUNT	100
 
 #define CONFIG_BOOTDELAY	3
 
@@ -148,6 +149,8 @@
  */
 #define CONFIG_SYS_LONGHELP	/* undef to save memory */
 #define CONFIG_SYS_PROMPT	"MX35 U-Boot > "
+#define CONFIG_ARCH_CPU_INIT
+#define CONFIG_ARCH_MMU
 #define CONFIG_AUTO_COMPLETE
 #define CONFIG_SYS_CBSIZE	256	/* Console I/O Buffer Size */
 /* Print Buffer Size */
@@ -162,7 +165,7 @@
 
 #define CONFIG_SYS_LOAD_ADDR		CONFIG_LOADADDR
 
-#define CONFIG_SYS_HZ		CONFIG_MX35_CLK32/* use 32kHz clock as source */
+#define CONFIG_SYS_HZ				1000
 
 #define CONFIG_CMDLINE_EDITING	1
 
diff --git a/include/configs/mx51_3stack.h b/include/configs/mx51_3stack.h
index 794ae83..29f30da 100644
--- a/include/configs/mx51_3stack.h
+++ b/include/configs/mx51_3stack.h
@@ -40,7 +40,7 @@
 #define CONFIG_SKIP_RELOCATE_UBOOT
 
 #define CONFIG_MX51_HCLK_FREQ	24000000	/* RedBoot says 26MHz */
-#define CONFIG_MX51_CLK32	32768
+
 #define CONFIG_DISPLAY_CPUINFO
 #define CONFIG_DISPLAY_BOARDINFO
 
@@ -90,6 +90,7 @@
 #undef CONFIG_CMD_IMLS
 #define CONFIG_CMD_MII
 #define CONFIG_CMD_NET
+#define CONFIG_NET_RETRY_COUNT	100
 #define CONFIG_NET_MULTI
 #define CONFIG_CMD_MMC
 
@@ -173,7 +174,7 @@
 
 #define CONFIG_SYS_LOAD_ADDR		CONFIG_LOADADDR
 
-#define CONFIG_SYS_HZ	CONFIG_MX51_CLK32/* use 32kHz clock as source */
+#define CONFIG_SYS_HZ				1000
 
 #define CONFIG_CMDLINE_EDITING	1
 
diff --git a/include/configs/mx51_3stack_android.h b/include/configs/mx51_3stack_android.h
index 04bcbb8..bed1200 100644
--- a/include/configs/mx51_3stack_android.h
+++ b/include/configs/mx51_3stack_android.h
@@ -40,7 +40,7 @@
 #define CONFIG_SKIP_RELOCATE_UBOOT
 
 #define CONFIG_MX51_HCLK_FREQ	24000000	/* RedBoot says 26MHz */
-#define CONFIG_MX51_CLK32	32768
+
 #define CONFIG_DISPLAY_CPUINFO
 #define CONFIG_DISPLAY_BOARDINFO
 
@@ -89,6 +89,7 @@
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_MII
 #define CONFIG_CMD_NET
+#define CONFIG_NET_RETRY_COUNT	100
 /*
 #define CONFIG_CMD_UBI
 #define CONFIG_CMD_UBIFS
@@ -242,7 +243,7 @@
 
 #define CONFIG_SYS_LOAD_ADDR		CONFIG_LOADADDR
 
-#define CONFIG_SYS_HZ	CONFIG_MX51_CLK32/* use 32kHz clock as source */
+#define CONFIG_SYS_HZ				1000
 
 #define CONFIG_CMDLINE_EDITING	1
 
diff --git a/include/configs/mx51_bbg.h b/include/configs/mx51_bbg.h
index e00ae62..8ef891f 100644
--- a/include/configs/mx51_bbg.h
+++ b/include/configs/mx51_bbg.h
@@ -39,7 +39,7 @@
 #define CONFIG_SKIP_RELOCATE_UBOOT
 
 #define CONFIG_MX51_HCLK_FREQ	24000000	/* RedBoot says 26MHz */
-#define CONFIG_MX51_CLK32	32768
+
 #define CONFIG_DISPLAY_CPUINFO
 #define CONFIG_DISPLAY_BOARDINFO
 
@@ -113,6 +113,7 @@
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_MII
 #define CONFIG_CMD_NET
+#define CONFIG_NET_RETRY_COUNT	100
 #define CONFIG_CMD_SPI
 #define CONFIG_CMD_SF
 #define CONFIG_CMD_MMC
@@ -213,7 +214,7 @@
 
 #define CONFIG_SYS_LOAD_ADDR		CONFIG_LOADADDR
 
-#define CONFIG_SYS_HZ	CONFIG_MX51_CLK32/* use 32kHz clock as source */
+#define CONFIG_SYS_HZ				1000
 
 #define CONFIG_CMDLINE_EDITING	1
 
diff --git a/include/configs/mx51_bbg_android.h b/include/configs/mx51_bbg_android.h
index 24ffc6c..ea1998c 100644
--- a/include/configs/mx51_bbg_android.h
+++ b/include/configs/mx51_bbg_android.h
@@ -40,7 +40,7 @@
 #define CONFIG_SKIP_RELOCATE_UBOOT
 
 #define CONFIG_MX51_HCLK_FREQ	24000000	/* RedBoot says 26MHz */
-#define CONFIG_MX51_CLK32	32768
+
 #define CONFIG_DISPLAY_CPUINFO
 #define CONFIG_DISPLAY_BOARDINFO
 
@@ -73,6 +73,7 @@
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_MII
 #define CONFIG_CMD_NET
+#define CONFIG_NET_RETRY_COUNT	100
 
 /*
  * Android support Configs
@@ -201,7 +202,7 @@
 
 #define CONFIG_SYS_LOAD_ADDR		CONFIG_LOADADDR
 
-#define CONFIG_SYS_HZ	CONFIG_MX51_CLK32/* use 32kHz clock as source */
+#define CONFIG_SYS_HZ				1000
 
 #define CONFIG_CMDLINE_EDITING	1