summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Hendricks <dhendrix@chromium.org>2013-03-19 17:12:46 -0700
committerDavid Hendricks <dhendrix@chromium.org>2013-03-21 05:12:32 +0100
commit2138afe943edec9237790583bc1b699436fd4da4 (patch)
treeddd15943f0ec21ea4a0307226eb8efadf7f504fb
parent8ec69053f1a9f107f73f018fd613cf3038a12c7c (diff)
armv7: remove old isb() and dsb() macros
This removes some old macros that we no longer use. Change-Id: I9d87beb5c2deca228cdf89a98e54b2779be0f0ea Signed-off-by: David Hendricks <dhendrix@chromium.org> Reviewed-on: http://review.coreboot.org/2868 Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org> Tested-by: build bot (Jenkins)
-rw-r--r--src/arch/armv7/include/arch/io.h1
-rw-r--r--src/arch/armv7/include/system.h3
2 files changed, 0 insertions, 4 deletions
diff --git a/src/arch/armv7/include/arch/io.h b/src/arch/armv7/include/arch/io.h
index 623c305530..b99e014392 100644
--- a/src/arch/armv7/include/arch/io.h
+++ b/src/arch/armv7/include/arch/io.h
@@ -97,7 +97,6 @@ extern inline void __raw_readsl(unsigned int addr, void *data, int longlen)
* TODO: The kernel offers some more advanced versions of barriers, it might
* have some advantages to use them instead of the simple one here.
*/
-//#define dmb() __asm__ __volatile__ ("" : : : "memory")
#define __iormb() dmb()
#define __iowmb() dmb()
diff --git a/src/arch/armv7/include/system.h b/src/arch/armv7/include/system.h
index f3e9b6b7f3..eda0bc1806 100644
--- a/src/arch/armv7/include/system.h
+++ b/src/arch/armv7/include/system.h
@@ -43,9 +43,6 @@
*/
#define __asmeq(x, y) ".ifnc " x "," y " ; .err ; .endif\n\t"
-/* FIXME: conflicts with new implementation in cache.c */
-//#define isb() __asm__ __volatile__ ("" : : : "memory")
-
#define nop() __asm__ __volatile__("mov\tr0,r0\t@ nop\n\t");
#define arch_align_stack(x) (x)