diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2011-08-08 02:22:41 -0400 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2011-08-08 02:22:41 -0400 |
commit | 1a43f2012455a977397deffe35912fd3f3ce17b9 (patch) | |
tree | 5189f337df44e7a495fbd097cd476b0380babd8c /arch/arm/mm/proc-arm7tdmi.S | |
parent | e1b96ada659431669efaf3defa997abf5db68130 (diff) | |
parent | 322a8b034003c0d46d39af85bf24fee27b902f48 (diff) |
Merge commit 'v3.1-rc1' into imx-fixes
Diffstat (limited to 'arch/arm/mm/proc-arm7tdmi.S')
-rw-r--r-- | arch/arm/mm/proc-arm7tdmi.S | 216 |
1 files changed, 39 insertions, 177 deletions
diff --git a/arch/arm/mm/proc-arm7tdmi.S b/arch/arm/mm/proc-arm7tdmi.S index 537ffcb0646d..7e0e1fe4ed4d 100644 --- a/arch/arm/mm/proc-arm7tdmi.S +++ b/arch/arm/mm/proc-arm7tdmi.S | |||
@@ -17,6 +17,8 @@ | |||
17 | #include <asm/pgtable.h> | 17 | #include <asm/pgtable.h> |
18 | #include <asm/ptrace.h> | 18 | #include <asm/ptrace.h> |
19 | 19 | ||
20 | #include "proc-macros.S" | ||
21 | |||
20 | .text | 22 | .text |
21 | /* | 23 | /* |
22 | * cpu_arm7tdmi_proc_init() | 24 | * cpu_arm7tdmi_proc_init() |
@@ -55,197 +57,57 @@ __arm7tdmi_setup: | |||
55 | 57 | ||
56 | __INITDATA | 58 | __INITDATA |
57 | 59 | ||
58 | /* | 60 | @ define struct processor (see <asm/proc-fns.h> and proc-macros.S) |
59 | * Purpose : Function pointers used to access above functions - all calls | 61 | define_processor_functions arm7tdmi, dabort=v4t_late_abort, pabort=legacy_pabort, nommu=1 |
60 | * come through these | ||
61 | */ | ||
62 | .type arm7tdmi_processor_functions, #object | ||
63 | ENTRY(arm7tdmi_processor_functions) | ||
64 | .word v4t_late_abort | ||
65 | .word legacy_pabort | ||
66 | .word cpu_arm7tdmi_proc_init | ||
67 | .word cpu_arm7tdmi_proc_fin | ||
68 | .word cpu_arm7tdmi_reset | ||
69 | .word cpu_arm7tdmi_do_idle | ||
70 | .word cpu_arm7tdmi_dcache_clean_area | ||
71 | .word cpu_arm7tdmi_switch_mm | ||
72 | .word 0 @ cpu_*_set_pte | ||
73 | .word 0 | ||
74 | .word 0 | ||
75 | .word 0 | ||
76 | .size arm7tdmi_processor_functions, . - arm7tdmi_processor_functions | ||
77 | 62 | ||
78 | .section ".rodata" | 63 | .section ".rodata" |
79 | 64 | ||
80 | .type cpu_arch_name, #object | 65 | string cpu_arch_name, "armv4t" |
81 | cpu_arch_name: | 66 | string cpu_elf_name, "v4" |
82 | .asciz "armv4t" | 67 | string cpu_arm7tdmi_name, "ARM7TDMI" |
83 | .size cpu_arch_name, . - cpu_arch_name | 68 | string cpu_triscenda7_name, "Triscend-A7x" |
84 | 69 | string cpu_at91_name, "Atmel-AT91M40xxx" | |
85 | .type cpu_elf_name, #object | 70 | string cpu_s3c3410_name, "Samsung-S3C3410" |
86 | cpu_elf_name: | 71 | string cpu_s3c44b0x_name, "Samsung-S3C44B0x" |
87 | .asciz "v4" | 72 | string cpu_s3c4510b_name, "Samsung-S3C4510B" |
88 | .size cpu_elf_name, . - cpu_elf_name | 73 | string cpu_s3c4530_name, "Samsung-S3C4530" |
89 | 74 | string cpu_netarm_name, "NETARM" | |
90 | .type cpu_arm7tdmi_name, #object | ||
91 | cpu_arm7tdmi_name: | ||
92 | .asciz "ARM7TDMI" | ||
93 | .size cpu_arm7tdmi_name, . - cpu_arm7tdmi_name | ||
94 | |||
95 | .type cpu_triscenda7_name, #object | ||
96 | cpu_triscenda7_name: | ||
97 | .asciz "Triscend-A7x" | ||
98 | .size cpu_triscenda7_name, . - cpu_triscenda7_name | ||
99 | |||
100 | .type cpu_at91_name, #object | ||
101 | cpu_at91_name: | ||
102 | .asciz "Atmel-AT91M40xxx" | ||
103 | .size cpu_at91_name, . - cpu_at91_name | ||
104 | |||
105 | .type cpu_s3c3410_name, #object | ||
106 | cpu_s3c3410_name: | ||
107 | .asciz "Samsung-S3C3410" | ||
108 | .size cpu_s3c3410_name, . - cpu_s3c3410_name | ||
109 | |||
110 | .type cpu_s3c44b0x_name, #object | ||
111 | cpu_s3c44b0x_name: | ||
112 | .asciz "Samsung-S3C44B0x" | ||
113 | .size cpu_s3c44b0x_name, . - cpu_s3c44b0x_name | ||
114 | |||
115 | .type cpu_s3c4510b, #object | ||
116 | cpu_s3c4510b_name: | ||
117 | .asciz "Samsung-S3C4510B" | ||
118 | .size cpu_s3c4510b_name, . - cpu_s3c4510b_name | ||
119 | |||
120 | .type cpu_s3c4530_name, #object | ||
121 | cpu_s3c4530_name: | ||
122 | .asciz "Samsung-S3C4530" | ||
123 | .size cpu_s3c4530_name, . - cpu_s3c4530_name | ||
124 | |||
125 | .type cpu_netarm_name, #object | ||
126 | cpu_netarm_name: | ||
127 | .asciz "NETARM" | ||
128 | .size cpu_netarm_name, . - cpu_netarm_name | ||
129 | 75 | ||
130 | .align | 76 | .align |
131 | 77 | ||
132 | .section ".proc.info.init", #alloc, #execinstr | 78 | .section ".proc.info.init", #alloc, #execinstr |
133 | 79 | ||
134 | .type __arm7tdmi_proc_info, #object | 80 | .macro arm7tdmi_proc_info name:req, cpu_val:req, cpu_mask:req, cpu_name:req, \ |
135 | __arm7tdmi_proc_info: | 81 | extra_hwcaps=0 |
136 | .long 0x41007700 | 82 | .type __\name\()_proc_info, #object |
137 | .long 0xfff8ff00 | 83 | __\name\()_proc_info: |
138 | .long 0 | 84 | .long \cpu_val |
139 | .long 0 | 85 | .long \cpu_mask |
140 | b __arm7tdmi_setup | ||
141 | .long cpu_arch_name | ||
142 | .long cpu_elf_name | ||
143 | .long HWCAP_SWP | HWCAP_26BIT | ||
144 | .long cpu_arm7tdmi_name | ||
145 | .long arm7tdmi_processor_functions | ||
146 | .long 0 | ||
147 | .long 0 | ||
148 | .long v4_cache_fns | ||
149 | .size __arm7tdmi_proc_info, . - __arm7tdmi_proc_info | ||
150 | |||
151 | .type __triscenda7_proc_info, #object | ||
152 | __triscenda7_proc_info: | ||
153 | .long 0x0001d2ff | ||
154 | .long 0x0001ffff | ||
155 | .long 0 | ||
156 | .long 0 | ||
157 | b __arm7tdmi_setup | ||
158 | .long cpu_arch_name | ||
159 | .long cpu_elf_name | ||
160 | .long HWCAP_SWP | HWCAP_THUMB | HWCAP_26BIT | ||
161 | .long cpu_triscenda7_name | ||
162 | .long arm7tdmi_processor_functions | ||
163 | .long 0 | ||
164 | .long 0 | ||
165 | .long v4_cache_fns | ||
166 | .size __triscenda7_proc_info, . - __triscenda7_proc_info | ||
167 | |||
168 | .type __at91_proc_info, #object | ||
169 | __at91_proc_info: | ||
170 | .long 0x14000040 | ||
171 | .long 0xfff000e0 | ||
172 | .long 0 | ||
173 | .long 0 | ||
174 | b __arm7tdmi_setup | ||
175 | .long cpu_arch_name | ||
176 | .long cpu_elf_name | ||
177 | .long HWCAP_SWP | HWCAP_THUMB | HWCAP_26BIT | ||
178 | .long cpu_at91_name | ||
179 | .long arm7tdmi_processor_functions | ||
180 | .long 0 | ||
181 | .long 0 | ||
182 | .long v4_cache_fns | ||
183 | .size __at91_proc_info, . - __at91_proc_info | ||
184 | |||
185 | .type __s3c4510b_proc_info, #object | ||
186 | __s3c4510b_proc_info: | ||
187 | .long 0x36365000 | ||
188 | .long 0xfffff000 | ||
189 | .long 0 | ||
190 | .long 0 | ||
191 | b __arm7tdmi_setup | ||
192 | .long cpu_arch_name | ||
193 | .long cpu_elf_name | ||
194 | .long HWCAP_SWP | HWCAP_THUMB | HWCAP_26BIT | ||
195 | .long cpu_s3c4510b_name | ||
196 | .long arm7tdmi_processor_functions | ||
197 | .long 0 | ||
198 | .long 0 | ||
199 | .long v4_cache_fns | ||
200 | .size __s3c4510b_proc_info, . - __s3c4510b_proc_info | ||
201 | |||
202 | .type __s3c4530_proc_info, #object | ||
203 | __s3c4530_proc_info: | ||
204 | .long 0x4c000000 | ||
205 | .long 0xfff000e0 | ||
206 | .long 0 | ||
207 | .long 0 | ||
208 | b __arm7tdmi_setup | ||
209 | .long cpu_arch_name | ||
210 | .long cpu_elf_name | ||
211 | .long HWCAP_SWP | HWCAP_THUMB | HWCAP_26BIT | ||
212 | .long cpu_s3c4530_name | ||
213 | .long arm7tdmi_processor_functions | ||
214 | .long 0 | ||
215 | .long 0 | ||
216 | .long v4_cache_fns | ||
217 | .size __s3c4530_proc_info, . - __s3c4530_proc_info | ||
218 | |||
219 | .type __s3c3410_proc_info, #object | ||
220 | __s3c3410_proc_info: | ||
221 | .long 0x34100000 | ||
222 | .long 0xffff0000 | ||
223 | .long 0 | ||
224 | .long 0 | ||
225 | b __arm7tdmi_setup | ||
226 | .long cpu_arch_name | ||
227 | .long cpu_elf_name | ||
228 | .long HWCAP_SWP | HWCAP_THUMB | HWCAP_26BIT | ||
229 | .long cpu_s3c3410_name | ||
230 | .long arm7tdmi_processor_functions | ||
231 | .long 0 | ||
232 | .long 0 | ||
233 | .long v4_cache_fns | ||
234 | .size __s3c3410_proc_info, . - __s3c3410_proc_info | ||
235 | |||
236 | .type __s3c44b0x_proc_info, #object | ||
237 | __s3c44b0x_proc_info: | ||
238 | .long 0x44b00000 | ||
239 | .long 0xffff0000 | ||
240 | .long 0 | 86 | .long 0 |
241 | .long 0 | 87 | .long 0 |
242 | b __arm7tdmi_setup | 88 | b __arm7tdmi_setup |
243 | .long cpu_arch_name | 89 | .long cpu_arch_name |
244 | .long cpu_elf_name | 90 | .long cpu_elf_name |
245 | .long HWCAP_SWP | HWCAP_THUMB | HWCAP_26BIT | 91 | .long HWCAP_SWP | HWCAP_26BIT | ( \extra_hwcaps ) |
246 | .long cpu_s3c44b0x_name | 92 | .long \cpu_name |
247 | .long arm7tdmi_processor_functions | 93 | .long arm7tdmi_processor_functions |
248 | .long 0 | 94 | .long 0 |
249 | .long 0 | 95 | .long 0 |
250 | .long v4_cache_fns | 96 | .long v4_cache_fns |
251 | .size __s3c44b0x_proc_info, . - __s3c44b0x_proc_info | 97 | .size __\name\()_proc_info, . - __\name\()_proc_info |
98 | .endm | ||
99 | |||
100 | arm7tdmi_proc_info arm7tdmi, 0x41007700, 0xfff8ff00, \ | ||
101 | cpu_arm7tdmi_name | ||
102 | arm7tdmi_proc_info triscenda7, 0x0001d2ff, 0x0001ffff, \ | ||
103 | cpu_triscenda7_name, extra_hwcaps=HWCAP_THUMB | ||
104 | arm7tdmi_proc_info at91, 0x14000040, 0xfff000e0, \ | ||
105 | cpu_at91_name, extra_hwcaps=HWCAP_THUMB | ||
106 | arm7tdmi_proc_info s3c4510b, 0x36365000, 0xfffff000, \ | ||
107 | cpu_s3c4510b_name, extra_hwcaps=HWCAP_THUMB | ||
108 | arm7tdmi_proc_info s3c4530, 0x4c000000, 0xfff000e0, \ | ||
109 | cpu_s3c4530_name, extra_hwcaps=HWCAP_THUMB | ||
110 | arm7tdmi_proc_info s3c3410, 0x34100000, 0xffff0000, \ | ||
111 | cpu_s3c3410_name, extra_hwcaps=HWCAP_THUMB | ||
112 | arm7tdmi_proc_info s3c44b0x, 0x44b00000, 0xffff0000, \ | ||
113 | cpu_s3c44b0x_name, extra_hwcaps=HWCAP_THUMB | ||