r358 - cpu/x86/pc/olpc

Author: wmb
Date: 2007-05-04 11:52:31 +0200 (Fri, 04 May 2007)
New Revision: 358

Modified:
   cpu/x86/pc/olpc/chipinit.fth
   cpu/x86/pc/olpc/fw.bth
   cpu/x86/pc/olpc/usb.fth
Log:
OLPC - claim virtual address space that is mapped V=P so it doesn't get reused.

Modified: cpu/x86/pc/olpc/chipinit.fth
===================================================================
--- cpu/x86/pc/olpc/chipinit.fth	2007-05-04 09:06:46 UTC (rev 357)
+++ cpu/x86/pc/olpc/chipinit.fth	2007-05-04 09:52:31 UTC (rev 358)
@@ -628,6 +628,7 @@

: video-map
 [ifdef] virtual-mode
+   gp-base h# c000 0  mmu-claim drop
    gp-base dup  h# c000  -1  mmu-map
 [then]

Modified: cpu/x86/pc/olpc/fw.bth
===================================================================
--- cpu/x86/pc/olpc/fw.bth	2007-05-04 09:06:46 UTC (rev 357)
+++ cpu/x86/pc/olpc/fw.bth	2007-05-04 09:52:31 UTC (rev 358)
@@ -204,6 +204,13 @@

[ifdef] virtual-mode
 fload ${BP}/cpu/x86/pc/mmusetup.fth	\ Initial values for MMU lists
+dev /mmu
+: claim-rom  ( -- )
+   (initial-claim)
+   rom-pa  h# ffff.0000 over -  claim-virtual drop   \ ROM 1-1 map
+;
+' claim-rom to initial-claim
+dend
 [then]

fload ${BP}/cpu/x86/pc/olpc/devices.fth

Modified: cpu/x86/pc/olpc/usb.fth
===================================================================
--- cpu/x86/pc/olpc/usb.fth	2007-05-04 09:06:46 UTC (rev 357)
+++ cpu/x86/pc/olpc/usb.fth	2007-05-04 09:52:31 UTC (rev 358)
@@ -95,8 +95,10 @@
    h# 400000ef.c00fffff. h# 5101.0020 wrmsr
    h# 00000002.efc00000. h# 5120.000b wrmsr
 [ifdef] virtual-mode
-   h# efc00000 dup h# 1000 -1 mmu-map  \ UOC
-   h# fe01a000 dup h# 1000 -1 mmu-map  \ OHCI
+   h# efc00000 h# 1000 0 mmu-claim drop  \ UOC
+   h# efc00000 dup h# 1000 -1 mmu-map    \ UOC
+   h# fe01a000 h# 1000 0 mmu-claim drop  \ OHCI
+   h# fe01a000 dup h# 1000 -1 mmu-map    \ OHCI
 [then]
    \ Configure the assignment of 2 USB Power Enable pins to USB ports
    \ to correspond to the way they are wired on the board.