diff options
| author | cognet <cognet@FreeBSD.org> | 2005-12-21 15:02:31 +0000 |
|---|---|---|
| committer | cognet <cognet@FreeBSD.org> | 2005-12-21 15:02:31 +0000 |
| commit | 25ca56da4e61fee2a6680357dcaabc2b373d3ad3 (patch) | |
| tree | e5ed8775586bd5f5e8cfe8e206bc9334ff1e2013 /sys/arm/arm/locore.S | |
| parent | d92d18713fd43f30e34bce5b1af6f309fbec04eb (diff) | |
| download | FreeBSD-src-25ca56da4e61fee2a6680357dcaabc2b373d3ad3.zip FreeBSD-src-25ca56da4e61fee2a6680357dcaabc2b373d3ad3.tar.gz | |
Ooops, I removed the wrong bits.
This unbreak boot from a VA which is different from the PA.
Diffstat (limited to 'sys/arm/arm/locore.S')
| -rw-r--r-- | sys/arm/arm/locore.S | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/arm/arm/locore.S b/sys/arm/arm/locore.S index 175c8c6..494a10e 100644 --- a/sys/arm/arm/locore.S +++ b/sys/arm/arm/locore.S @@ -103,6 +103,9 @@ Lcopy_size: .word _edata-_C_LABEL(_start) Lstart_off: .word start_inram-_C_LABEL(_start) start_inram: adr r7, Lunmapped + bic r7, r7, #0xff000000 + orr r7, r7, #PHYSADDR + /* Disable MMU for a while */ mrc p15, 0, r2, c1, c0, 0 @@ -122,8 +125,6 @@ Lunmapped: /* build page table from scratch */ ldr r0, Lstartup_pagetable adr r4, mmu_init_table - bic r4, r4, #0xff000000 - orr r4, r4, #PHYSADDR b 3f 2: |
