[openfirmware] [commit] r2427 - cpu/x86/pc/biosload

[repository service]

Author: wmb
Date: Sat Aug  6 00:44:01 2011
New Revision: 2427
URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2427

Log:
Biosload version: Intel Pineview support, multiplexed I/O, tag file creation, make ega messages optional, better PCI addresses-assigned handling.

Modified:
   cpu/x86/pc/biosload/devices.fth
   cpu/x86/pc/biosload/fw.bth

Modified: cpu/x86/pc/biosload/devices.fth
==============================================================================
--- cpu/x86/pc/biosload/devices.fth	Sat Aug  6 00:41:36 2011	(r2426)
+++ cpu/x86/pc/biosload/devices.fth	Sat Aug  6 00:44:01 2011	(r2427)
@@ -10,6 +10,8 @@
    fload ${BP}/dev/pcibus.fth		\ Generic PCI bus package
 
 [ifdef] addresses-assigned
+   0 0  " addresses-preassigned" property
+0 [if]
    \ Suppress PCI address assignment; use the addresses the BIOS assigned
    patch false true master-probe
    patch noop assign-all-addresses prober
@@ -21,6 +23,7 @@
    patch or-w! my-w! find-fcode?
    patch 2drop my-w! find-fcode?
 [then]
+[then]
 
    fload ${BP}/cpu/x86/pc/biosload/pcinode.fth	\ System-specific words for PCI
 end-package
@@ -249,6 +252,14 @@
 devalias screen /display		\ Explicit, because it's not probed
 [then]
 
+[ifdef] use-pineview
+0 0  " 2,0"  " /pci" begin-package
+   " display" name
+   fload ${BP}/dev/intel/graphics/pineview.fth
+end-package
+devalias screen /pci/display at 2,0	\ Explicit, because it's not probed
+[then]
+
 [ifdef] use-ct65550
 0 0  " i3b0" " /isa" begin-package
    fload ${BP}/dev/ct6555x/loadpkg.fth	\ Video driver
@@ -337,13 +348,19 @@
 fload ${BP}/dev/usb2/device/debugport.fth	\ ISA COM port driver
 [else]
 fload ${BP}/dev/isa/diaguart.fth	\ ISA COM port driver
-h# 3f8 is uart-base
 [then]
 
 fload ${BP}/forth/lib/sysuart.fth	\ Use UART for key and emit
-fload ${BP}/cpu/x86/pc/egauart.fth		\ Output also to EGA
+[ifndef] no-ega-startup-messages
+fload ${BP}/cpu/x86/pc/egauart.fth	\ Output also to EGA
+[then]
+
+0 value keyboard-ih
+0 value screen-ih
+
+fload ${BP}/ofw/core/muxdev.fth		\ I/O collection/distribution device
 
-fload ${BP}/cpu/x86/pc/reset.fth		\ reset-all
+fload ${BP}/cpu/x86/pc/reset.fth	\ reset-all
 
 [ifdef] olpc
 \ true constant lx?			\ 

Modified: cpu/x86/pc/biosload/fw.bth
==============================================================================
--- cpu/x86/pc/biosload/fw.bth	Sat Aug  6 00:41:36 2011	(r2426)
+++ cpu/x86/pc/biosload/fw.bth	Sat Aug  6 00:44:01 2011	(r2427)
@@ -7,6 +7,8 @@
 in: bootsec.hex
 build-now
 
+" fw.tag" r/w create-file drop  tag-file !
+
 hex
 \ ' $report-name is include-hook
 
@@ -354,8 +356,9 @@
 
    auto-banner?  if
       " Probing" ?type  probe-all
-      " Install console" ?type  install-console
-      ?usb-keyboard
+      install-mux-io
+\      " Install console" ?type  install-console
+\      ?usb-keyboard
       banner
    then
 
@@ -406,6 +409,8 @@
 
 " dhcp" ' ip-address  set-config-string-default
 
+tag-file @ fclose  tag-file off
+
 .( SAVING FW.dic ...)
 " fw.dic" $save-forth cr