From 2138afe943edec9237790583bc1b699436fd4da4 Mon Sep 17 00:00:00 2001 From: David Hendricks Date: Tue, 19 Mar 2013 17:12:46 -0700 Subject: 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 Reviewed-on: http://review.coreboot.org/2868 Reviewed-by: Stefan Reinauer Tested-by: build bot (Jenkins) --- src/arch/armv7/include/arch/io.h | 1 - src/arch/armv7/include/system.h | 3 --- 2 files changed, 4 deletions(-) (limited to 'src/arch') 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) -- cgit v1.2.3