diff options
| author | Ye.Li <B37916@freescale.com> | 2015-05-04 17:15:29 +0800 |
|---|---|---|
| committer | Ye.Li <B37916@freescale.com> | 2015-05-04 22:27:30 +0800 |
| commit | 25a0ba04a051e5b3c03cc628c849551aa803409d (patch) | |
| tree | 0661c0faae359910b28aedea7d7b658e9cdb0f15 /include | |
| parent | cab4e299b24cb2ae3a429d7d52d9b4d9f9bfd163 (diff) | |
| download | u-boot-imx-25a0ba04a051e5b3c03cc628c849551aa803409d.zip u-boot-imx-25a0ba04a051e5b3c03cc628c849551aa803409d.tar.gz u-boot-imx-25a0ba04a051e5b3c03cc628c849551aa803409d.tar.bz2 | |
MLK-10808-4 imx: Move system counter driver to imx-common
Since the system counter driver will also be used by mx6ul, move
this timer driver to imx-common and rename it as syscounter.c
For mx6ul and mx7, configurations are used for choose the GPT timer
or system counter timer (default).
GPT timer: CONFIG_GPT_TIMER
System counter timer: CONFIG_SYSCOUNTER_TIMER
Signed-off-by: Ye.Li <B37916@freescale.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/mx6_common.h | 11 | ||||
| -rw-r--r-- | include/configs/mx7_common.h | 1 |
2 files changed, 10 insertions, 2 deletions
diff --git a/include/configs/mx6_common.h b/include/configs/mx6_common.h index c96ba97..d7ce792 100644 --- a/include/configs/mx6_common.h +++ b/include/configs/mx6_common.h @@ -17,6 +17,7 @@ #ifndef __MX6_COMMON_H #define __MX6_COMMON_H +#ifndef CONFIG_MX6UL #define CONFIG_ARM_ERRATA_743622 #if (defined(CONFIG_MX6QP) || defined(CONFIG_MX6Q) ||\ defined(CONFIG_MX6DL)) && !defined(CONFIG_MX6SOLO) @@ -25,8 +26,6 @@ defined(CONFIG_MX6DL)) && !defined(CONFIG_MX6SOLO) #define CONFIG_ARM_ERRATA_761320 #define CONFIG_ARM_ERRATA_845369 #endif -#define CONFIG_BOARD_POSTCLK_INIT -#define CONFIG_LDO_BYPASS_CHECK #ifndef CONFIG_SYS_L2CACHE_OFF #define CONFIG_SYS_L2_PL310 @@ -34,6 +33,14 @@ defined(CONFIG_MX6DL)) && !defined(CONFIG_MX6SOLO) #endif #define CONFIG_MP +#define CONFIG_GPT_TIMER +#else +#define CONFIG_SYSCOUNTER_TIMER +#define CONFIG_SC_TIMER_CLK 8000000 /* 8Mhz */ +#endif /* CONFIG_MX6UL */ + +#define CONFIG_BOARD_POSTCLK_INIT +#define CONFIG_LDO_BYPASS_CHECK #define CONFIG_MXC_GPT_HCLK #ifdef CONFIG_MX6QP #define CONFIG_MX6Q diff --git a/include/configs/mx7_common.h b/include/configs/mx7_common.h index 9352164..3e5c811 100644 --- a/include/configs/mx7_common.h +++ b/include/configs/mx7_common.h @@ -13,6 +13,7 @@ #define CONFIG_BOARD_POSTCLK_INIT #define CONFIG_MXC_GPT_HCLK +#define CONFIG_SYSCOUNTER_TIMER #define CONFIG_SC_TIMER_CLK 8000000 /* 8Mhz */ #define CONFIG_IOMUX_LPSR |