[openfirmware] r848 - cpu/x86/pc cpu/x86/pc/olpc dev/geode/display

[svn at openfirmware.info]

Author: wmb
Date: 2008-07-04 00:29:21 +0200 (Fri, 04 Jul 2008)
New Revision: 848

Modified:
   cpu/x86/pc/linux.fth
   cpu/x86/pc/olpc/devices.fth
   cpu/x86/pc/olpc/memtest.fth
   cpu/x86/pc/olpc/resume.bth
   dev/geode/display/loadpkg.fth
Log:
Q2E10


Modified: cpu/x86/pc/linux.fth
===================================================================
--- cpu/x86/pc/linux.fth	2008-07-03 21:20:46 UTC (rev 847)
+++ cpu/x86/pc/linux.fth	2008-07-03 22:29:21 UTC (rev 848)
@@ -178,6 +178,8 @@
 ;
 
 0 value linux-loaded?
+
+[ifdef] virtual-mode
 : ?linux-elf-map-in  ( va size -- )
    \ The Linux startup code really wants the physical address to be
    \ virtual_address AND 0x0fff.ffff.  We recognize Linux by the virtual
@@ -194,6 +196,7 @@
    (elf-map-in)
 ;
 ' ?linux-elf-map-in is elf-map-in
+[then]
 
 : init-bzimage?   ( -- flag )
    loaded                               ( adr len )

Modified: cpu/x86/pc/olpc/devices.fth
===================================================================
--- cpu/x86/pc/olpc/devices.fth	2008-07-03 21:20:46 UTC (rev 847)
+++ cpu/x86/pc/olpc/devices.fth	2008-07-03 22:29:21 UTC (rev 848)
@@ -308,8 +308,6 @@
 : ofw-fw-filename$  " disk:\boot\olpc.rom"  ;
 ' ofw-fw-filename$ to fw-filename$
 
-fload ${BP}/dev/geode/lpcflash.fth           \ Reflasher for PLCC FLASH on A-test
-
 : +i encode-int encode+  ;  : 0+i  0 +i  ;
 
 [ifdef] rom-loaded

Modified: cpu/x86/pc/olpc/memtest.fth
===================================================================
--- cpu/x86/pc/olpc/memtest.fth	2008-07-03 21:20:46 UTC (rev 847)
+++ cpu/x86/pc/olpc/memtest.fth	2008-07-03 22:29:21 UTC (rev 848)
@@ -5,13 +5,17 @@
    \ It expects that virtual = physical; we depend on the fact
    \ that we have low memory mapped V=P
    over  h# 10000 =  if  ( vaddr size )
+[ifdef] virtual-mode
       \ Map the frame buffer (virtual=physical)
       h# 910 config-l@ dup 100.0000 -1 mmu-map
+[then]
       unfreeze
    then
 
+[ifdef] ?linux-elf-map-in
    \ If it's not memtest, chain to the linux recognizer
    ?linux-elf-map-in
+[then]
 ;
 ' ?memtest-elf-map-in is elf-map-in
 

Modified: cpu/x86/pc/olpc/resume.bth
===================================================================
--- cpu/x86/pc/olpc/resume.bth	2008-07-03 21:20:46 UTC (rev 847)
+++ cpu/x86/pc/olpc/resume.bth	2008-07-03 22:29:21 UTC (rev 848)
@@ -331,7 +331,7 @@
 \   Running from a 32-bit identity-mapped code segment
 \   Using physical addresses
 
- char < 3f8 port-wb  begin  3fd port-rb 20 bitand  0<> until
+\ char < 3f8 port-wb  begin  3fd port-rb 20 bitand  0<> until
 
    resume-data #  bp  mov
 
@@ -730,7 +730,7 @@
 
    \ Identity mapping of low memory might not exist now
 
-  char > 3f8 port-wb  begin  3fd port-rb 20 bitand  0<> until
+\  char > 3f8 port-wb  begin  3fd port-rb 20 bitand  0<> until
 
    gs pop
 

Modified: dev/geode/display/loadpkg.fth
===================================================================
--- dev/geode/display/loadpkg.fth	2008-07-03 21:20:46 UTC (rev 847)
+++ dev/geode/display/loadpkg.fth	2008-07-03 22:29:21 UTC (rev 848)
@@ -6,6 +6,7 @@
 fload ${BP}/dev/geode/display/gxpci.fth          \ PCI interfaces
 fload ${BP}/dev/geode/display/gxfb.fth           \ Controller code
 fload ${BP}/dev/geode/display/gp.fth             \ Graphics processor support
+fload ${BP}/dev/geode/display/gxvga.fth          \ Text mode support
 fload ${BP}/dev/video/common/rectangle16.fth     \ Rectangular graphics
 fload ${BP}/cpu/x86/pc/olpc/expand16.fth         \ Expand image by 2x