r319 - cpu/x86/pc/olpc dev/geode/display

Author: wmb
Date: 2007-04-25 09:01:05 +0200 (Wed, 25 Apr 2007)
New Revision: 319

Modified:
   cpu/x86/pc/olpc/devices.fth
   cpu/x86/pc/olpc/vsapci.fth
   dev/geode/display/gxpci.fth
Log:
OLPC - fixed some fairly innocuous problems with the display device tree and display register mapping.

Modified: cpu/x86/pc/olpc/devices.fth
===================================================================
--- cpu/x86/pc/olpc/devices.fth	2007-04-25 06:59:47 UTC (rev 318)
+++ cpu/x86/pc/olpc/devices.fth	2007-04-25 07:01:05 UTC (rev 319)
@@ -290,7 +290,7 @@
    fload ${BP}/dev/geode/display/loadpkg.fth     \ Geode display

0 0 encode-bytes
-   h# 8200.0910 +i  0+i h# fd00.0000 +i  0+i h# 0100.0000 +i  \ Frame buffer
+   h# 8200.0910 +i  0+i h# fd00.0000 +i  0+i h# 0080.0000 +i  \ Frame buffer
    h# 8200.0914 +i  0+i h# fe00.0000 +i  0+i h# 0000.4000 +i  \ GP
    h# 8200.0918 +i  0+i h# fe40.0000 +i  0+i h# 0000.4000 +i  \ DC
    h# 8200.091c +i  0+i h# fe80.0000 +i  0+i h# 0000.4000 +i  \ VP

Modified: cpu/x86/pc/olpc/vsapci.fth
===================================================================
--- cpu/x86/pc/olpc/vsapci.fth	2007-04-25 06:59:47 UTC (rev 318)
+++ cpu/x86/pc/olpc/vsapci.fth	2007-04-25 07:01:05 UTC (rev 319)
@@ -201,7 +201,7 @@

h# ffffc000 gxfb-hdr h# 10 + l!  \ BAR4 MASK - VIP
       h# 20811022 gxfb-hdr h# 20 + l!  \ Vendor/device ID - AMD 
-      h# fe0c0000 gxfb-hdr h# 40 + l!  \ BAR4 address - VIP 
+      h# fe00c000 gxfb-hdr h# 40 + l!  \ BAR4 address - VIP 
    then

[ifdef] lx-devel  exit  [then]

Modified: dev/geode/display/gxpci.fth
===================================================================
--- dev/geode/display/gxpci.fth	2007-04-25 06:59:47 UTC (rev 318)
+++ dev/geode/display/gxpci.fth	2007-04-25 07:01:05 UTC (rev 319)
@@ -9,10 +9,11 @@

0 0 encode-bytes
 0 0 h# 0000.0000  my-space +  phys+   0 i+  h# 0000.0100 i+   \ Config registers
-0 0 h# 0200.0010  my-space +  phys+   0 i+  h# 0100.0000 i+   \ Frame buffer
+0 0 h# 0200.0010  my-space +  phys+   0 i+  h# 0080.0000 i+   \ Frame buffer
 0 0 h# 0200.0014  my-space +  phys+   0 i+  h# 0000.4000 i+   \ Display controller
 0 0 h# 0200.0018  my-space +  phys+   0 i+  h# 0000.4000 i+   \ Video controller
 0 0 h# 0200.001c  my-space +  phys+   0 i+  h# 0000.4000 i+   \ Graphics controller
+0 0 h# 0200.0020  my-space +  phys+   0 i+  h# 0000.4000 i+   \ Video Input Port
 " reg" property

: map-membar  ( bar size -- adr )
@@ -27,7 +28,7 @@
    h# 1c h# 4000 map-membar   ( gp-base dc-base vp-base )
 ;
 : (map-frame-buffer)  ( -- adr )
-   h# 10  h# 100.0000  map-membar
+   h# 10  h# 80.0000  map-membar
 ;
 \ LICENSE_BEGIN
 \ Copyright (c) 2006 FirmWorks