diff options
| author | Tom Rini <trini@ti.com> | 2013-02-12 10:18:31 -0500 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-02-12 10:18:31 -0500 |
| commit | 951c6baaf44c7fd4335b75fb92840d4e42c94927 (patch) | |
| tree | 6a09cce20c4f3affb7b500d018eb84f848e42c20 /arch/arm/include/asm/system.h | |
| parent | 58864ddc7276ca7403ddbb716da5853638f37519 (diff) | |
| parent | fd8e1c3866578d87ed14a04a59faae341fd415df (diff) | |
| download | talos-obmc-uboot-951c6baaf44c7fd4335b75fb92840d4e42c94927.tar.gz talos-obmc-uboot-951c6baaf44c7fd4335b75fb92840d4e42c94927.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'arch/arm/include/asm/system.h')
| -rw-r--r-- | arch/arm/include/asm/system.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/include/asm/system.h b/arch/arm/include/asm/system.h index 78ca8e0a6d..1918492eae 100644 --- a/arch/arm/include/asm/system.h +++ b/arch/arm/include/asm/system.h @@ -61,6 +61,12 @@ #define nop() __asm__ __volatile__("mov\tr0,r0\t@ nop\n\t"); +#ifdef __ARM_ARCH_7A__ +#define wfi() __asm__ __volatile__ ("wfi" : : : "memory") +#else +#define wfi() +#endif + static inline unsigned int get_cr(void) { unsigned int val; |
