diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-04-21 19:01:35 (GMT) |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-04-21 19:01:35 (GMT) |
| commit | c9aab0f9dd23fddcebf5984dc19e62b514e759a7 (patch) | |
| tree | 65ce91815907466f07e87d8b79eaf19763c282bf /arch/arm/cpu/armv7/Makefile | |
| parent | 94b972d366c29b92319865e3ded16da062aa8507 (diff) | |
| parent | 2e8f5dc16ad360cc15ea402a1dc4d421a04adbbd (diff) | |
| download | u-boot-c9aab0f9dd23fddcebf5984dc19e62b514e759a7.tar.xz | |
Merge branch 'u-boot-ti/master' into 'u-boot-arm/master'
Diffstat (limited to 'arch/arm/cpu/armv7/Makefile')
| -rw-r--r-- | arch/arm/cpu/armv7/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/cpu/armv7/Makefile b/arch/arm/cpu/armv7/Makefile index 119ebb3..ab869b1 100644 --- a/arch/arm/cpu/armv7/Makefile +++ b/arch/arm/cpu/armv7/Makefile @@ -25,6 +25,7 @@ endif obj-$(CONFIG_KONA) += kona-common/ obj-$(CONFIG_OMAP_COMMON) += omap-common/ +obj-$(CONFIG_SYS_ARCH_TIMER) += arch_timer.o obj-$(CONFIG_TEGRA) += tegra-common/ ifneq (,$(filter s5pc1xx exynos,$(SOC))) |