[OpenBIOS] r786 - in cpu/x86/pc: biosload olpc
svn at openbios.org
svn at openbios.org
Sun Jan 20 02:31:04 CET 2008
Author: wmb
Date: 2008-01-20 02:31:04 +0100 (Sun, 20 Jan 2008)
New Revision: 786
Modified:
cpu/x86/pc/biosload/fw.bth
cpu/x86/pc/olpc/fw.bth
cpu/x86/pc/olpc/linux.fth
Log:
OLPC trac 6101 - fixed bug with the loading of ELF format programs.
Modified: cpu/x86/pc/biosload/fw.bth
===================================================================
--- cpu/x86/pc/biosload/fw.bth 2008-01-18 18:36:36 UTC (rev 785)
+++ cpu/x86/pc/biosload/fw.bth 2008-01-20 01:31:04 UTC (rev 786)
@@ -145,7 +145,8 @@
fload ${BP}/ofw/elf/elf.fth
fload ${BP}/ofw/elf/elfdebug.fth
[ifdef] virtual-mode
-: (elf-map-in) ( va size -- ) swap 1 -rot allocate-aligned drop ;
+\ Depends on the assumption that physical memory is mapped 1:1 already
+: (elf-map-in) ( va size -- ) 0 mem-claim drop ;
' (elf-map-in) is elf-map-in
[else]
' 2drop is elf-map-in
Modified: cpu/x86/pc/olpc/fw.bth
===================================================================
--- cpu/x86/pc/olpc/fw.bth 2008-01-18 18:36:36 UTC (rev 785)
+++ cpu/x86/pc/olpc/fw.bth 2008-01-20 01:31:04 UTC (rev 786)
@@ -179,7 +179,8 @@
fload ${BP}/ofw/elf/elf.fth
fload ${BP}/ofw/elf/elfdebug.fth
[ifdef] virtual-mode
-: (elf-map-in) ( va size -- ) swap 1 -rot allocate-aligned drop ;
+\ Depends on the assumption that physical memory is mapped 1:1 already
+: (elf-map-in) ( va size -- ) 0 mem-claim drop ;
' (elf-map-in) is elf-map-in
[else]
' 2drop is elf-map-in
Modified: cpu/x86/pc/olpc/linux.fth
===================================================================
--- cpu/x86/pc/olpc/linux.fth 2008-01-18 18:36:36 UTC (rev 785)
+++ cpu/x86/pc/olpc/linux.fth 2008-01-20 01:31:04 UTC (rev 786)
@@ -251,11 +251,8 @@
\ It expects that virtual = physical; we depend on the fact
\ that we have low memory mapped V=P
over h# 10000 = if ( vaddr size )
- 0 mem-claim drop
-
\ Map the frame buffer (virtual=physical)
h# 910 config-l@ dup 100.0000 -1 mmu-map
- exit
then
\ If it's not memtest, chain to the linux recognizer
More information about the OpenBIOS
mailing list