diff options
| author | Ye Li <ye.li@nxp.com> | 2016-03-14 17:52:12 +0800 |
|---|---|---|
| committer | Ye Li <ye.li@nxp.com> | 2017-04-05 14:04:34 +0800 |
| commit | 8503bcf92a07b212a0f25b9650bd90aedf0b2039 (patch) | |
| tree | b845a72d1b152c2ad8b67dea8478174ec8893a6d /arch | |
| parent | 586f2004644f441820cff256f3db0530fcb6404d (diff) | |
| download | u-boot-imx-8503bcf92a07b212a0f25b9650bd90aedf0b2039.zip u-boot-imx-8503bcf92a07b212a0f25b9650bd90aedf0b2039.tar.gz u-boot-imx-8503bcf92a07b212a0f25b9650bd90aedf0b2039.tar.bz2 | |
MLK-12557 mx6ul: Enable syscounter as default timer
Use syscounter for i.MX6UL platform as default timer, not use GPT.
Add a CONFIG_GPT_TIMER for selecting GPT. Using CONFIG_SYSCOUNTER_TIMER
for selecting system counter.
Signed-off-by: Ye Li <ye.li@nxp.com>
(cherry picked from commit 1c27c9ecf80b3cc63a7c9751ebfd11755f847b1d)
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/imx-common/Kconfig | 7 | ||||
| -rw-r--r-- | arch/arm/imx-common/Makefile | 10 |
2 files changed, 14 insertions, 3 deletions
diff --git a/arch/arm/imx-common/Kconfig b/arch/arm/imx-common/Kconfig index 7ee74d5..6e91c7c 100644 --- a/arch/arm/imx-common/Kconfig +++ b/arch/arm/imx-common/Kconfig @@ -1,6 +1,13 @@ config IMX_CONFIG string +config GPT_TIMER + bool "Using i.MX GPT timer as system tick timer" + depends on ARCH_MX6 || ARCH_MX7 + help + Enable GPT timer driver for system tick timer on i.MX6 and + i.MX7. + config ROM_UNIFIED_SECTIONS bool diff --git a/arch/arm/imx-common/Makefile b/arch/arm/imx-common/Makefile index da53f62..c6401f6 100644 --- a/arch/arm/imx-common/Makefile +++ b/arch/arm/imx-common/Makefile @@ -2,7 +2,7 @@ # (C) Copyright 2000-2006 # Wolfgang Denk, DENX Software Engineering, wd@denx.de. # -# (C) Copyright 2011 Freescale Semiconductor, Inc. +# (C) Copyright 2011-2016 Freescale Semiconductor, Inc. # # SPDX-License-Identifier: GPL-2.0+ # @@ -11,9 +11,12 @@ ifeq ($(SOC),$(filter $(SOC),mx25 mx35 mx5 mx6 mx7 vf610)) obj-y = iomux-v3.o endif ifeq ($(SOC),$(filter $(SOC),mx5 mx6)) -obj-y += timer.o cpu.o speed.o +obj-y += cpu.o speed.o obj-$(CONFIG_SYS_I2C_MXC) += i2c-mxv7.o endif +ifeq ($(SOC),$(filter $(SOC),mx5)) +obj-y += timer.o +endif ifeq ($(SOC),$(filter $(SOC),mx7 mx6 mxs)) obj-y += misc.o obj-$(CONFIG_SPL_BUILD) += spl.o @@ -21,7 +24,6 @@ endif ifeq ($(SOC),$(filter $(SOC),mx7)) obj-y += cpu.o obj-$(CONFIG_SYS_I2C_MXC) += i2c-mxv7.o -obj-$(CONFIG_SYSCOUNTER_TIMER) += syscounter.o endif ifeq ($(SOC),$(filter $(SOC),mx6 mx7)) obj-y += cache.o init.o @@ -30,6 +32,8 @@ obj-$(CONFIG_IMX_VIDEO_SKIP) += video.o obj-$(CONFIG_IMX_RDC) += rdc-sema.o obj-$(CONFIG_IMX_BOOTAUX) += imx_bootaux.o obj-$(CONFIG_SECURE_BOOT) += hab.o +obj-$(CONFIG_GPT_TIMER) += timer.o +obj-$(CONFIG_SYSCOUNTER_TIMER) += syscounter.o endif ifeq ($(SOC),$(filter $(SOC),vf610)) obj-y += ddrmc-vf610.o |