[openfirmware] [commit] r2601 - cpu/arm/olpc/1.75

[repository service]

Author: wmb
Date: Thu Oct 13 06:27:05 2011
New Revision: 2601
URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2601

Log:
OLPC XO-1.75 - Fixed regression that caused test /memory to fail; the DMA region was no longer mapped virtual=physical.

Modified:
   cpu/arm/olpc/1.75/prefw.bth
   cpu/arm/olpc/1.75/probemem.fth

Modified: cpu/arm/olpc/1.75/prefw.bth
==============================================================================
--- cpu/arm/olpc/1.75/prefw.bth	Thu Oct 13 03:13:55 2011	(r2600)
+++ cpu/arm/olpc/1.75/prefw.bth	Thu Oct 13 06:27:05 2011	(r2601)
@@ -64,6 +64,9 @@
 ;
 ' (cpu-arch to cpu-arch
 
+[ifndef] virtual-mode
+fload ${BP}/cpu/arm/mmp2/mmuon.fth
+[then]
 fload ${BP}/cpu/arm/olpc/1.75/probemem.fth	\ Memory probing
 
 stand-init: Probing memory
@@ -77,8 +80,6 @@
 ;
 fload ${BP}/ofw/core/initdict.fth	\ Dynamic dictionary allocation
 fload ${BP}/arch/arm/loadarea.fth	\ Allocate and map program load area
-[else]
-fload ${BP}/cpu/arm/mmp2/mmuon.fth
 [then]
 
 \ XXX should be elsewhere

Modified: cpu/arm/olpc/1.75/probemem.fth
==============================================================================
--- cpu/arm/olpc/1.75/probemem.fth	Thu Oct 13 03:13:55 2011	(r2600)
+++ cpu/arm/olpc/1.75/probemem.fth	Thu Oct 13 06:27:05 2011	(r2601)
@@ -93,7 +93,11 @@
    then                                 ( )
 ;
 
+: map-dma  ( -- )
+   dma-mem-va >physical dup  /dma-mem map-sections
+;
 : selftest  ( -- error? )
+   map-dma
 
    false to mem-fail?