diff options
Diffstat (limited to 'arch/arm/include')
-rw-r--r-- | arch/arm/include/asm/memory.h | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/arch/arm/include/asm/memory.h b/arch/arm/include/asm/memory.h index 5421d82a2572..f5e693b8bab3 100644 --- a/arch/arm/include/asm/memory.h +++ b/arch/arm/include/asm/memory.h | |||
@@ -76,6 +76,17 @@ | |||
76 | */ | 76 | */ |
77 | #define IOREMAP_MAX_ORDER 24 | 77 | #define IOREMAP_MAX_ORDER 24 |
78 | 78 | ||
79 | /* | ||
80 | * Size of DMA-consistent memory region. Must be multiple of 2M, | ||
81 | * between 2MB and 14MB inclusive. | ||
82 | */ | ||
83 | #ifndef CONSISTENT_DMA_SIZE | ||
84 | #define CONSISTENT_DMA_SIZE SZ_2M | ||
85 | #endif | ||
86 | |||
87 | #define CONSISTENT_END (0xffe00000UL) | ||
88 | #define CONSISTENT_BASE (CONSISTENT_END - CONSISTENT_DMA_SIZE) | ||
89 | |||
79 | #else /* CONFIG_MMU */ | 90 | #else /* CONFIG_MMU */ |
80 | 91 | ||
81 | /* | 92 | /* |
@@ -113,14 +124,6 @@ | |||
113 | #endif /* !CONFIG_MMU */ | 124 | #endif /* !CONFIG_MMU */ |
114 | 125 | ||
115 | /* | 126 | /* |
116 | * Size of DMA-consistent memory region. Must be multiple of 2M, | ||
117 | * between 2MB and 14MB inclusive. | ||
118 | */ | ||
119 | #ifndef CONSISTENT_DMA_SIZE | ||
120 | #define CONSISTENT_DMA_SIZE SZ_2M | ||
121 | #endif | ||
122 | |||
123 | /* | ||
124 | * Physical vs virtual RAM address space conversion. These are | 127 | * Physical vs virtual RAM address space conversion. These are |
125 | * private definitions which should NOT be used outside memory.h | 128 | * private definitions which should NOT be used outside memory.h |
126 | * files. Use virt_to_phys/phys_to_virt/__pa/__va instead. | 129 | * files. Use virt_to_phys/phys_to_virt/__pa/__va instead. |