Merge git://git.denx.de/u-boot-sunxi

[oweals/u-boot.git] / arch / arm / include / asm / armv7m.h

diff --git a/arch/arm/include/asm/armv7m.h b/arch/arm/include/asm/armv7m.h
index ebf0f1704281e3903017e4c0c0f7ba9dded76a9c..af8a97e988972dcc13c2800a111b75f25560363d 100644 (file)
--- a/arch/arm/include/asm/armv7m.h
+++ b/arch/arm/include/asm/armv7m.h
@@ -70,24 +70,5 @@ struct v7m_mpu {
 };
 #define V7M_MPU                                ((struct v7m_mpu *)V7M_MPU_BASE)
 
-#define V7M_MPU_CTRL_ENABLE            (1 << 0)
-#define V7M_MPU_CTRL_HFNMIENA          (1 << 1)
-
-#define V7M_MPU_CTRL_ENABLE            (1 << 0)
-#define V7M_MPU_CTRL_DISABLE           (0 << 0)
-#define V7M_MPU_CTRL_HFNMIENA          (1 << 1)
-
-#define V7M_MPU_RASR_EN                        (1 << 0)
-#define V7M_MPU_RASR_SIZE_BITS         1
-#define V7M_MPU_RASR_SIZE_4GB          (31 << V7M_MPU_RASR_SIZE_BITS)
-#define V7M_MPU_RASR_SIZE_8MB          (24 << V7M_MPU_RASR_SIZE_BITS)
-#define V7M_MPU_RASR_TEX_SHIFT 19
-#define V7M_MPU_RASR_S_SHIFT           18
-#define V7M_MPU_RASR_C_SHIFT           17
-#define V7M_MPU_RASR_B_SHIFT           16
-#define V7M_MPU_RASR_AP_RW_RW          (3 << 24)
-#define V7M_MPU_RASR_XN_ENABLE (0 << 28)
-#define V7M_MPU_RASR_XN_DISABLE (1 << 28)
-
 #endif /* !defined(__ASSEMBLY__) */
 #endif /* ARMV7M_H */