diff options
| author | Colin Cross <ccross@android.com> | 2010-04-25 00:29:07 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2011-11-30 21:34:36 -0800 |
| commit | ad117211ea3b94a22a8f0e8571403dabd93cfaa6 (patch) | |
| tree | fc71242ee58e5aa1efc528109f292f30a91f13be /arch | |
| parent | cf742bbbdb55404cec10e8e8ed6949c897160f40 (diff) | |
[ARM] Add ARCH_PROVIDES_UDELAY config option
Change-Id: Ife690c9d055fc0f17a52d2b29048af5062a664a6
Signed-off-by: Colin Cross <ccross@android.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/Kconfig | 3 | ||||
| -rw-r--r-- | arch/arm/include/asm/delay.h | 4 | ||||
| -rw-r--r-- | arch/arm/lib/Makefile | 6 |
3 files changed, 12 insertions, 1 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 3146ed3f6eca..82c6521d04a7 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -186,6 +186,9 @@ config FIQ config ARCH_MTD_XIP bool +config ARCH_PROVIDES_UDELAY + bool + config VECTORS_BASE hex default 0xffff0000 if MMU || CPU_HIGH_VECTOR diff --git a/arch/arm/include/asm/delay.h b/arch/arm/include/asm/delay.h index b2deda181549..57f1fa0e983b 100644 --- a/arch/arm/include/asm/delay.h +++ b/arch/arm/include/asm/delay.h @@ -8,6 +8,9 @@ #include <asm/param.h> /* HZ */ +#ifdef CONFIG_ARCH_PROVIDES_UDELAY +#include <mach/delay.h> +#else extern void __delay(int loops); /* @@ -40,5 +43,6 @@ extern void __const_udelay(unsigned long); __const_udelay((n) * ((2199023U*HZ)>>11))) : \ __udelay(n)) +#endif /* defined(ARCH_PROVIDES_UDELAY) */ #endif /* defined(_ARM_DELAY_H) */ diff --git a/arch/arm/lib/Makefile b/arch/arm/lib/Makefile index cf73a7f742dd..775132a100f0 100644 --- a/arch/arm/lib/Makefile +++ b/arch/arm/lib/Makefile @@ -6,7 +6,7 @@ lib-y := backtrace.o changebit.o csumipv6.o csumpartial.o \ csumpartialcopy.o csumpartialcopyuser.o clearbit.o \ - delay.o findbit.o memchr.o memcpy.o \ + findbit.o memchr.o memcpy.o \ memmove.o memset.o memzero.o setbit.o \ strncpy_from_user.o strnlen_user.o \ strchr.o strrchr.o \ @@ -17,6 +17,10 @@ lib-y := backtrace.o changebit.o csumipv6.o csumpartial.o \ mmu-y := clear_user.o copy_page.o getuser.o putuser.o +ifneq ($(CONFIG_ARCH_PROVIDES_UDELAY),y) + lib-y += delay.o +endif + # the code in uaccess.S is not preemption safe and # probably faster on ARMv3 only ifeq ($(CONFIG_PREEMPT),y) |