Changeset 3082


Ignore:
Timestamp:
Jul 22, 2012, 4:47:25 PM (3 years ago)
Author:
wmb
Message:

OLPC ARM - coalesced initmmu.fth into one file, with parameterized differences between mmp2 and mmp3.

Location:
cpu/arm
Files:
3 added
6 edited

Legend:

Unmodified
Added
Removed
  • cpu/arm/mmp3/initmmu.fth

    r3073 r3082  
    8080
    8181      inc  r0,#32                      \ Next set
    82       set  r2,#0x1ffe0                 \ Mask for set field for L2 cache - depends on #sets=4096
     82      set  r2,`l2-#sets h# 20 - #`     \ Mask for set field for L2 cache
    8383      ands r1,r0,r2                    \ Mask set bits
    8484   0= until
     
    230230   mov    r1,0xd0000000    \ Memory controller base address
    231231
     232[ifdef] mmp3
     233   \ MMP3 memory controller
    232234   ldr    r2,[r1,#0x10]    \ MMAP0 register
    233235   ands   r3,r2,#1         \ Test CS_VALID
     
    259261   movne  r2,r2,lsr #27    \ Move AREA_LENGTH to LSB
    260262   addne  r0,r0,r3,lsl r2  \ Compute bank size and add to accumulator
     263[else]
     264   \ MMP2 memory controller
     265   ldr    r2,[r1,#0x100]   \ MMAP0 register
     266   ands   r3,r2,#1         \ Test CS_VALID
     267   movne  r3,#0x10000      \ Scale factor for memory size
     268   movne  r2,r2,lsl #12    \ Clear high bits above AREA_LENGTH field
     269   movne  r2,r2,lsr #28    \ Move AREA_LENGTH to LSB
     270   addne  r0,r0,r3,lsl r2  \ Compute bank size and add to accumulator
     271
     272   ldr    r2,[r1,#0x110]   \ MMAP1 register
     273   ands   r3,r2,#1         \ Test CS_VALID
     274   movne  r3,#0x10000      \ Scale factor for memory size
     275   movne  r2,r2,lsl #12    \ Clear high bits above AREA_LENGTH field
     276   movne  r2,r2,lsr #28    \ Move AREA_LENGTH to LSB
     277   addne  r0,r0,r3,lsl r2  \ Compute bank size and add to accumulator
     278[then]
    261279
    262280   mov    pc,lr
  • cpu/arm/mmp3/resetvec.fth

    r3073 r3082  
    114114
    115115\ Load some additional subroutines that are used by the startup code
    116 fload ${BP}/cpu/arm/mmp3/initmmu.fth    \ Setup the initial virtual address map
     116fload ${BP}/cpu/arm/mmp2/initmmu.fth    \ Setup the initial virtual address map
    117117
    118118\ **** This is the main-line code for the initial startup sequence.
  • cpu/arm/mmp3/thunderstone/config.fth

    r3073 r3082  
    77create machine-signature ," TS0"
    88
    9 h# 20000 constant l2-#sets
     9fload ${BP}/cpu/arm/mmp3/soc-config.fth
  • cpu/arm/olpc/3.0/config.fth

    r3064 r3082  
    3131h# 8000 value /ec-flash
    3232
    33 h# 10000 constant l2-#sets
     33fload ${BP}/cpu/arm/mmp2/soc-config.fth
    3434
    3535fload ${BP}/cpu/arm/olpc/3.0/gpiopins.fth
  • cpu/arm/olpc/cl4/config.fth

    r3064 r3082  
    2828h# 10000 value /ec-flash
    2929
    30 h# 20000 constant l2-#sets
     30fload ${BP}/cpu/arm/mmp3/soc-config.fth
    3131
    3232fload ${BP}/cpu/arm/olpc/cl4/gpiopins.fth
  • cpu/arm/olpc/resetvec.fth

    r3020 r3082  
    114114
    115115\ Load some additional subroutines that are used by the startup code
    116 fload ${BP}/cpu/arm/olpc/initmmu.fth    \ Setup the initial virtual address map
     116fload ${BP}/cpu/arm/mmp2/initmmu.fth    \ Setup the initial virtual address map
    117117
    118118\ **** This is the main-line code for the initial startup sequence.
Note: See TracChangeset for help on using the changeset viewer.