Author: wmb Date: Sat Aug 6 02:32:41 2011 New Revision: 2429 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2429
Log: Alex - better memory probing.
Modified: cpu/x86/pc/alex/devices.fth cpu/x86/pc/alex/fw.bth cpu/x86/pc/alex/probemem.fth
Modified: cpu/x86/pc/alex/devices.fth ============================================================================== --- cpu/x86/pc/alex/devices.fth Sat Aug 6 01:52:34 2011 (r2428) +++ cpu/x86/pc/alex/devices.fth Sat Aug 6 02:32:41 2011 (r2429) @@ -1,10 +1,6 @@ \ See license at end of file purpose: Load device drivers according to configuration definitions
-fload ${BP}/cpu/x86/pc/isaio.fth - -fload ${BP}/dev/pci/configm1.fth \ Generic PCI configuration access - 0 0 " " " /" begin-package fload ${BP}/cpu/x86/pc/mappci.fth \ Map PCI to root fload ${BP}/dev/pcibus.fth \ Generic PCI bus package
Modified: cpu/x86/pc/alex/fw.bth ============================================================================== --- cpu/x86/pc/alex/fw.bth Sat Aug 6 01:52:34 2011 (r2428) +++ cpu/x86/pc/alex/fw.bth Sat Aug 6 02:32:41 2011 (r2429) @@ -82,6 +82,9 @@
fload ${BP}/cpu/x86/pc/rootnode.fth \ Platform-specific root node changes
+fload ${BP}/cpu/x86/pc/isaio.fth +fload ${BP}/dev/pci/configm1.fth \ Generic PCI configuration access + fload ${BP}/cpu/x86/pc/alex/probemem.fth \ Memory probing
[ifdef] virtual-mode
Modified: cpu/x86/pc/alex/probemem.fth ============================================================================== --- cpu/x86/pc/alex/probemem.fth Sat Aug 6 01:52:34 2011 (r2428) +++ cpu/x86/pc/alex/probemem.fth Sat Aug 6 02:32:41 2011 (r2429) @@ -3,35 +3,22 @@
dev /memory
-: /ram ( -- #bytes ) mem-info-pa la1+ l@ ; +: /ram ( -- #bytes ) 0 h# b0 config-w@ wljoin ; \ Pineview/Atom 450 chipset +: usable-ramtop ( -- n ) h# ac config-l@ ; \ Pineview TSEG Memory Base
: release-range ( start-adr end-adr -- ) over - release ;
: probe ( -- ) 0 /ram reg \ Report extant memory
- \ Put h# 10.0000-1f.ffff and 28.0000-memsize in pool, - \ reserving 0..10.0000 for the firmware - \ and 20.0000-27.ffff for the "flash" - -\ h# 0.0000 h# 02.0000 release \ A little bit of DMA space, we hope -\ h# 10.0000 h# 0f.ffff release -\ h# 28.0000 h# 80.0000 h# 28.0000 - release - -\ Release some of the first meg, between the page tables and the DOS hole, -\ for use as DMA memory. + \ Release some of the first meg, between the page tables and the DOS hole, + \ for use as DMA memory. mem-info-pa 2 la+ l@ h# a.0000 release-range \ Below DOS hole
-[ifdef] virtual-mode - h# 10.0000 dropin-base over - release - dropin-base dropin-size + mem-info-pa la1+ l@ over - release - -[else] fw-pa h# 10.0000 u> if h# 10.0000 fw-pa over - release fw-pa /fw-ram + heap-base heap-size + umax /ram release then -[then] ;
device-end