diff options
Diffstat (limited to 'arch/arm/mm/proc-arm720.S')
| -rw-r--r-- | arch/arm/mm/proc-arm720.S | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/arch/arm/mm/proc-arm720.S b/arch/arm/mm/proc-arm720.S index 86102467d37f..0e6946ab6e5b 100644 --- a/arch/arm/mm/proc-arm720.S +++ b/arch/arm/mm/proc-arm720.S | |||
| @@ -169,11 +169,11 @@ __arm720_setup: | |||
| 169 | #ifdef CONFIG_MMU | 169 | #ifdef CONFIG_MMU |
| 170 | mcr p15, 0, r0, c8, c7, 0 @ flush TLB (v4) | 170 | mcr p15, 0, r0, c8, c7, 0 @ flush TLB (v4) |
| 171 | #endif | 171 | #endif |
| 172 | adr r5, arm720_crval | ||
| 173 | ldmia r5, {r5, r6} | ||
| 172 | mrc p15, 0, r0, c1, c0 @ get control register | 174 | mrc p15, 0, r0, c1, c0 @ get control register |
| 173 | ldr r5, arm720_cr1_clear | ||
| 174 | bic r0, r0, r5 | 175 | bic r0, r0, r5 |
| 175 | ldr r5, arm720_cr1_set | 176 | orr r0, r0, r6 |
| 176 | orr r0, r0, r5 | ||
| 177 | mov pc, lr @ __ret (head.S) | 177 | mov pc, lr @ __ret (head.S) |
| 178 | .size __arm720_setup, . - __arm720_setup | 178 | .size __arm720_setup, . - __arm720_setup |
| 179 | 179 | ||
| @@ -183,12 +183,9 @@ __arm720_setup: | |||
| 183 | * ..1. 1001 ..11 1101 | 183 | * ..1. 1001 ..11 1101 |
| 184 | * | 184 | * |
| 185 | */ | 185 | */ |
| 186 | .type arm720_cr1_clear, #object | 186 | .type arm720_crval, #object |
| 187 | .type arm720_cr1_set, #object | 187 | arm720_crval: |
| 188 | arm720_cr1_clear: | 188 | crval clear=0x00002f3f, mmuset=0x0000213d, ucset=0x00000130 |
| 189 | .word 0x2f3f | ||
| 190 | arm720_cr1_set: | ||
| 191 | .word 0x213d | ||
| 192 | 189 | ||
| 193 | __INITDATA | 190 | __INITDATA |
| 194 | 191 | ||
| @@ -246,6 +243,10 @@ __arm710_proc_info: | |||
| 246 | PMD_BIT4 | \ | 243 | PMD_BIT4 | \ |
| 247 | PMD_SECT_AP_WRITE | \ | 244 | PMD_SECT_AP_WRITE | \ |
| 248 | PMD_SECT_AP_READ | 245 | PMD_SECT_AP_READ |
| 246 | .long PMD_TYPE_SECT | \ | ||
| 247 | PMD_BIT4 | \ | ||
| 248 | PMD_SECT_AP_WRITE | \ | ||
| 249 | PMD_SECT_AP_READ | ||
| 249 | b __arm710_setup @ cpu_flush | 250 | b __arm710_setup @ cpu_flush |
| 250 | .long cpu_arch_name @ arch_name | 251 | .long cpu_arch_name @ arch_name |
| 251 | .long cpu_elf_name @ elf_name | 252 | .long cpu_elf_name @ elf_name |
| @@ -267,6 +268,10 @@ __arm720_proc_info: | |||
| 267 | PMD_BIT4 | \ | 268 | PMD_BIT4 | \ |
| 268 | PMD_SECT_AP_WRITE | \ | 269 | PMD_SECT_AP_WRITE | \ |
| 269 | PMD_SECT_AP_READ | 270 | PMD_SECT_AP_READ |
| 271 | .long PMD_TYPE_SECT | \ | ||
| 272 | PMD_BIT4 | \ | ||
| 273 | PMD_SECT_AP_WRITE | \ | ||
| 274 | PMD_SECT_AP_READ | ||
| 270 | b __arm720_setup @ cpu_flush | 275 | b __arm720_setup @ cpu_flush |
| 271 | .long cpu_arch_name @ arch_name | 276 | .long cpu_arch_name @ arch_name |
| 272 | .long cpu_elf_name @ elf_name | 277 | .long cpu_elf_name @ elf_name |