openfirmware July 2009

openfirmware@openfirmware.info

2 participants
38 discussions

r1238 - cpu/x86/pc/biosload
by svn＠openfirmware.info 16 Jul '09

16 Jul '09

Author: wmb Date: 2009-07-16 20:58:55 +0200 (Thu, 16 Jul 2009) New Revision: 1238 Modified: cpu/x86/pc/biosload/HOWTO_USB_boot.txt Log: HOWTO_USB_boot: fixed error in syslinux usage description Modified: cpu/x86/pc/biosload/HOWTO_USB_boot.txt =================================================================== --- cpu/x86/pc/biosload/HOWTO_USB_boot.txt 2009-07-03 05:58:09 UTC (rev 1237) +++ cpu/x86/pc/biosload/HOWTO_USB_boot.txt 2009-07-16 18:58:55 UTC (rev 1238) @@ -29,11 +29,11 @@ * Unmount any filesystems that are currently mounted on the USB drive -* Find the USB drive's device name. It will probably be something like /dev/sda . You want the name of the whole drive (just sda), NOT a subordinate partition (NOT sda1). +* Find the device name for the partition containing the filesystem on the USB drive. It will probably be something like /dev/sda1 . If the device is partitioned, you want the name of the partition (e.g. /dev/sda1). If the device is not partitioned, you want the name of the whole drive (e.g. /dev/sda). -* Run this command, replacing "/dev/sda" with the appropriate device name for your USB drive: +* Run this command, replacing "/dev/sda1" with the appropriate device name for your USB drive: - $ syslinux /dev/sda + $ syslinux /dev/sda1 ==== ... On Windows ====

1 0

r1237 - in cpu/x86/pc/olpc: . via
by svn＠openfirmware.info 03 Jul '09

03 Jul '09

Author: rsmith Date: 2009-07-03 07:58:09 +0200 (Fri, 03 Jul 2009) New Revision: 1237 Modified: cpu/x86/pc/olpc/rtcwake.fth cpu/x86/pc/olpc/via/devices.fth cpu/x86/pc/olpc/via/versions.fth Log: - Version bump to q3a05 - Include EC code 1.9.5 - Add EC wakeup testing words - Re-enable battery.fth so OFW can talk with the EC about the battery Modified: cpu/x86/pc/olpc/rtcwake.fth =================================================================== --- cpu/x86/pc/olpc/rtcwake.fth 2009-07-03 04:25:06 UTC (rev 1236) +++ cpu/x86/pc/olpc/rtcwake.fth 2009-07-03 05:58:09 UTC (rev 1237) @@ -69,6 +69,18 @@ key drop ; +: autowack-test ( ms -- ) + autowack-delay + autowack-on + 0 begin + s + dup space .d (cr 1+ key? + until + ." Keypress Exit key= " + key . drop + autowack-off +; + \ for testing wakeups from the EC : wackup-test-ec ( ms -- ) d# 3000 autowack-delay \ At small ms delays the host can miss the SCI so this @@ -80,7 +92,8 @@ swap dup ( ms count count ) space .d (cr 1+ key? ( ms count+1 ) until - key drop 2drop + ." Keypress Exit key= " + key . 2drop autowack-off ; Modified: cpu/x86/pc/olpc/via/devices.fth =================================================================== --- cpu/x86/pc/olpc/via/devices.fth 2009-07-03 04:25:06 UTC (rev 1236) +++ cpu/x86/pc/olpc/via/devices.fth 2009-07-03 05:58:09 UTC (rev 1237) @@ -319,7 +319,7 @@ .( XXX Reinstate kbdtype.fth) cr \ fload ${BP}/cpu/x86/pc/olpc/kbdtype.fth \ Export keyboard type -[ifdef] use-ec-Later +[ifdef] use-ec fload ${BP}/dev/olpc/kb3700/battery.fth \ Battery status reports [else] : ?enough-power ; Modified: cpu/x86/pc/olpc/via/versions.fth =================================================================== --- cpu/x86/pc/olpc/via/versions.fth 2009-07-03 04:25:06 UTC (rev 1236) +++ cpu/x86/pc/olpc/via/versions.fth 2009-07-03 05:58:09 UTC (rev 1237) @@ -2,16 +2,15 @@ \ The overall firmware revision macro: FW_MAJOR A -macro: FW_MINOR 04b +macro: FW_MINOR 05 \ The EC microcode -macro: EC_VERSION 1_9_4 +macro: EC_VERSION 1_9_5 \ Alternate command for getting EC microcode, for testing new versions. \ Temporarily uncomment the line and modify the path as necessary -\ macro: GET_EC cp pq3a00.img ec.img -\ macro: GET_EC wget -q http://dev.laptop.org/pub/ec/ec_via_test.img -O ec.img -\ macro: GET_EC wget -q http://dev.laptop.org/pub/ec/cl1b-1_9_0rc2.img -O ec.img +\ macro: GET_EC cp ~rsmith/olpc/ec/ec-code15/image/ecimage.bin ec.img +\ macro: GET_EC wget -q http://dev.laptop.org/pub/ec/ec_test.img -O ec.img macro: KEYS mpkeys \ macro: KEYS testkeys

1 0

r1236 - in cpu/arm: . pxa3xx pxa3xx/build
by svn＠openfirmware.info 03 Jul '09

03 Jul '09

Author: wmb Date: 2009-07-03 06:25:06 +0200 (Fri, 03 Jul 2009) New Revision: 1236 Added: cpu/arm/pxa3xx/ cpu/arm/pxa3xx/build/ cpu/arm/pxa3xx/build/Makefile cpu/arm/pxa3xx/pxa3xx.bth Log: ARM - added a rudimentary platform directory for PXA3xx SOCs. Added: cpu/arm/pxa3xx/build/Makefile =================================================================== --- cpu/arm/pxa3xx/build/Makefile (rev 0) +++ cpu/arm/pxa3xx/build/Makefile 2009-07-03 04:25:06 UTC (rev 1236) @@ -0,0 +1,59 @@ +OS := $(shell uname) + +BASEDIR= `(cd ../../../..; pwd;)` +TAGFILES= ../../build/*.tag *.tag +CLIENTDIR=../../../../clients +CLIENTPROGS= + +all: pxa3xx.rom tags + +pxa3xx.tag: pxa3xx.rom + +tags: pxa3xx.tag + @${BASEDIR}/forth/lib/toctags ${BASEDIR} ${TAGFILES} + +pxa3xx.rom: FORCE build ${CLIENTPROGS} + ./build $@ + +../../${OS}/forth: + @make -C ../../${OS} forth + +../../build/inflate.bin: + @make -C ../../build inflate.bin + +build: ../../${OS}/forth + @ln -sf ../../${OS}/forth build + +clean: + rm -f *.dic *.log headers *~ *.elf *.di *.img builton.fth build *.rom *.version + +clean-all: clean + @make -C ../../build clean + @make -C ../../${OS} clean + +.PHONY: FORCE clean all clean-all + +# LICENSE_BEGIN +# Copyright (c) 2009 FirmWorks +# +# Permission is hereby granted, free of charge, to any person obtaining +# a copy of this software and associated documentation files (the +# "Software"), to deal in the Software without restriction, including +# without limitation the rights to use, copy, modify, merge, publish, +# distribute, sublicense, and/or sell copies of the Software, and to +# permit persons to whom the Software is furnished to do so, subject to +# the following conditions: +# +# The above copyright notice and this permission notice shall be +# included in all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +# +# LICENSE_END + Added: cpu/arm/pxa3xx/pxa3xx.bth =================================================================== --- cpu/arm/pxa3xx/pxa3xx.bth (rev 0) +++ cpu/arm/pxa3xx/pxa3xx.bth 2009-07-03 04:25:06 UTC (rev 1236) @@ -0,0 +1,91 @@ +purpose: Load file for OFW on ARM beagleboard +\ See license at end of file + +dictionary: ${BP}/cpu/arm/build/basefw.dic +command: &armforth &dictionary &this +build-now + +" beagle.tag" r/w create-file drop tag-file ! + +\ ' $report-name is include-hook + +use-movable-vector-base \ CortexA8 CPU core has a movable vector base + +h# 8.0000 constant initial-heap-size + +: (initial-heap) ( -- adr len ) limit initial-heap-size ; +' (initial-heap) to initial-heap + + +fload ${BP}/dev/omap/diaguart.fth \ OMAP UART +h# 40100000 to uart-base \ UART# base address on PXA3xx +d# 14745600 to uart-clock-frequency \ Normal mode UART clock +\ d# 59429000 to uart-clock-frequency \ High speed mode UART clock + +fload ${BP}/forth/lib/sysuart.fth \ Set console I/O vectors to UART + + +\ Install the simple UART driver from the standalone I/O init chain +: stand-init-io ( -- ) + stand-init-io + inituarts install-uart-io +; + +0 [if] \ This turns off an LED; it's useful for startup debugging +code usr1-off + begin + set r1,0x49056090 + set r2,0x00400000 + str r2,[r1] + again +c; +[then] + +\ This is some glue code to convert the machine setup that QEMU gives us +\ to the setup that start-forth (see arm/boot.fth) wants. +\ We get here via a call instruction at origin+8, which is inserted below + +code stand-cold-code ( r0: 0 r1: board-id r2: &kernel-args lr: &aif_header+8c ) + here origin 8 + put-call \ Insert call instruction + + \ Put the arguments in safe registers + sub r6,lr,#0x8c \ r6 points to header (lr set by code at origin) + mov r7,#0 \ r7: functions + add r8,r6,0x200000 \ r8: memtop - 2MiB above load address + \ r9 is up + mov r10,#0 \ r10: argc + mov r11,r2 \ r11: argv (kernel args) + mov r12,`initial-heap-size` \ r12: initial-heap-size + + b 'code start-forth \ Branch to the generic startup code +end-code + +tag-file @ fclose tag-file off + +fload ${BP}/cpu/arm/saverom.fth \ Save the dictionary for standalone startup + +.( --- Saving pxa3xx.rom --- ) cr " pxa3xx.rom" $save-rom + +\ LICENSE_BEGIN +\ Copyright (c) 2009 FirmWorks +\ +\ Permission is hereby granted, free of charge, to any person obtaining +\ a copy of this software and associated documentation files (the +\ "Software"), to deal in the Software without restriction, including +\ without limitation the rights to use, copy, modify, merge, publish, +\ distribute, sublicense, and/or sell copies of the Software, and to +\ permit persons to whom the Software is furnished to do so, subject to +\ the following conditions: +\ +\ The above copyright notice and this permission notice shall be +\ included in all copies or substantial portions of the Software. +\ +\ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +\ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +\ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +\ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +\ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +\ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +\ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +\ +\ LICENSE_END Property changes on: cpu/arm/pxa3xx/pxa3xx.bth ___________________________________________________________________ Added: svn:executable + *

1 0

r1235 - cpu/arm/beagle/build
by svn＠openfirmware.info 03 Jul '09

03 Jul '09

Author: wmb Date: 2009-07-03 06:16:01 +0200 (Fri, 03 Jul 2009) New Revision: 1235 Modified: cpu/arm/beagle/build/ Log: svn ignore Property changes on: cpu/arm/beagle/build ___________________________________________________________________ Added: svn:ignore + build tags

1 0

r1234 - cpu/x86/pc/olpc/via/build
by svn＠openfirmware.info 03 Jul '09

03 Jul '09

Author: wmb Date: 2009-07-03 06:14:51 +0200 (Fri, 03 Jul 2009) New Revision: 1234 Modified: cpu/x86/pc/olpc/via/build/ Log: svn ignore Property changes on: cpu/x86/pc/olpc/via/build ___________________________________________________________________ Modified: svn:ignore - *.txt *.public *.rom *.version tags sourceurl *.tag build builton.fth VIA.ROM *.bin memtest + *.txt *.public *.rom *.version tags sourceurl *.tag build builton.fth VIA.ROM *.bin memtest *.aml *.stamp

1 0

r1233 - cpu/x86/pc/olpc/via
by svn＠openfirmware.info 03 Jul '09

03 Jul '09

Author: wmb Date: 2009-07-03 06:07:29 +0200 (Fri, 03 Jul 2009) New Revision: 1233 Modified: cpu/x86/pc/olpc/via/acpi.fth cpu/x86/pc/olpc/via/romreset.bth Log: Via - another try at ACPI wakeup. Modified: cpu/x86/pc/olpc/via/acpi.fth =================================================================== --- cpu/x86/pc/olpc/via/acpi.fth 2009-07-03 04:06:23 UTC (rev 1232) +++ cpu/x86/pc/olpc/via/acpi.fth 2009-07-03 04:07:29 UTC (rev 1233) @@ -232,7 +232,9 @@ dup >acpi-table-len 9 fix-checksum ; -h# 28 constant rm-ds \ Must agree with GDT in rmstart.fth +h# 18 constant ds32 \ Must agree with GDT in rmstart.fth +h# 20 constant cs16 \ Must agree with GDT in rmstart.fth +h# 28 constant ds16 \ Must agree with GDT in rmstart.fth label do-acpi-wake \ This code must be copied to low memory @@ -251,22 +253,16 @@ h# 0f # ax and ax cx mov op: 4 # bx shr - \ The following might be unnecessary - ax ax xor rm-ds # al mov \ 16-bit data segment - ax ds mov ax es mov ax ss mov + \ Set data segment for storing offset and segment below + ax ax xor ds16 # al mov ax ds mov \ 16-bit data segment + cx wake-adr wa1+ #) mov \ Offset + bx wake-adr la1+ #) mov \ Segment - cx wake-adr la1+ #) mov \ Offset - bx wake-adr wa1+ #) mov \ Segment + cr0 ax mov h# fe # al and ax cr0 mov \ Enter real mode - op: cr0 ax mov h# fe # al and op: ax cr0 mov \ Enter real mode + here 5 + do-acpi-wake - wake-adr + lwsplit d# 12 lshift #) far jmp \ Jump to set cs - here 5 + do-acpi-wake - wake-adr + lwsplit #) far jmp \ Jump to set cs - - \ The following might be unnecessary - \ Now we are running in real mode; fix segments again - cs ax mov ax ds mov ax es mov - - wake-adr wa1+ s#) far jmp + cs: wake-adr wa1+ lwsplit drop s#) far jmp end-code here do-acpi-wake - constant /do-acpi-wake Modified: cpu/x86/pc/olpc/via/romreset.bth =================================================================== --- cpu/x86/pc/olpc/via/romreset.bth 2009-07-03 04:06:23 UTC (rev 1232) +++ cpu/x86/pc/olpc/via/romreset.bth 2009-07-03 04:07:29 UTC (rev 1233) @@ -13,7 +13,7 @@ \needs write-dropin fload ${BP}/forth/lib/mkdropin.fth \needs >seg:off fload ${BP}/cpu/x86/pc/rmtools.fth -h# 20 constant rm-cs \ Must agree with GDT in rmstart.fth +h# 20 constant cs16 \ Must agree with GDT in rmstart.fth fload ${BP}/cpu/x86/mmuparam.fth @@ -178,8 +178,7 @@ facs-adr h# c + #) ax mov ax ax or 0<> if \ Resume in real mode for ACPI operating systems \ Linear wakeup address is in EAX - sp sp xor \ Possibly unnecessary - wake-adr lwsplit drop rm-cs #) far jmp + wake-adr lwsplit drop cs16 #) far jmp else \ Resume in 32-bit protected mode for OFW resume-data # sp mov

1 0

r1232 - cpu/x86 forth/kernel
by svn＠openfirmware.info 03 Jul '09

03 Jul '09

Author: wmb Date: 2009-07-03 06:06:23 +0200 (Fri, 03 Jul 2009) New Revision: 1232 Modified: cpu/x86/kerncode.fth cpu/x86/syscall.fth cpu/x86/target.fth forth/kernel/kernel.fth forth/kernel/sysio.fth Log: Kernel - added omit-files configuration option for smaller kernel. Modified: cpu/x86/kerncode.fth =================================================================== --- cpu/x86/kerncode.fth 2009-07-01 00:25:47 UTC (rev 1231) +++ cpu/x86/kerncode.fth 2009-07-03 04:06:23 UTC (rev 1232) @@ -38,10 +38,17 @@ :-h /n* /n * ;-h +[ifdef] omit-files \ assembler macro to assemble next :-h next + meta-asm[ ax lods 0 [ax] jmp ]meta-asm +;-h +[else] +\ assembler macro to assemble next +:-h next meta-asm[ up jmp ]meta-asm ;-h +[then] :-h c; next end-code ;-h Modified: cpu/x86/syscall.fth =================================================================== --- cpu/x86/syscall.fth 2009-07-01 00:25:47 UTC (rev 1231) +++ cpu/x86/syscall.fth 2009-07-03 04:06:23 UTC (rev 1232) @@ -171,16 +171,19 @@ \ systems (e.g. CP/M) require this; others which don't require it \ usually run faster with alignment than without. +[ifndef] omit-files hex \ Aligns to a 512-byte boundary; this is okay for most systems. : _falign ( l.byte# fd -- l.aligned ) drop 1ff invert and ; : _dfalign ( d.byte# fd -- d.aligned ) drop swap 1ff invert and swap ; +[then] : sys-init-io ( -- ) init-relocation \ must be first, for [is] to work install-wrapper-io install-disk-io + \ Don't poll the keyboard under an OS; block waiting for a key ['] (key ['] key (is ; Modified: cpu/x86/target.fth =================================================================== --- cpu/x86/target.fth 2009-07-01 00:25:47 UTC (rev 1231) +++ cpu/x86/target.fth 2009-07-03 04:06:23 UTC (rev 1232) @@ -29,11 +29,15 @@ \t16-t /w-t constant /link-t \t32-t /l-t constant /link-t /token-t constant /defer-t +[ifdef] omit-files +/n-t th 100 * constant user-size-t +[else] [ifdef] big-endian-t \ reloc code uses 300 in both cases. should we????? /n-t th 600 * constant user-size-t [else] /n-t th c00 * constant user-size-t [then] +[then] /n-t th 100 * constant ps-size-t /n-t th 100 * constant rs-size-t \t16-t /w-t constant /user#-t Modified: forth/kernel/kernel.fth =================================================================== --- forth/kernel/kernel.fth 2009-07-01 00:25:47 UTC (rev 1231) +++ forth/kernel/kernel.fth 2009-07-03 04:06:23 UTC (rev 1232) @@ -1365,6 +1365,9 @@ nuser tag-file decimal +[ifdef] omit-files +: $tagout 2drop ; +[else] : $tag-field ( $ -- ) tag-file @ fputs ; : tag-char ( char -- ) tag-file @ fputc ; : $tagout ( name$ -- ) @@ -1375,6 +1378,7 @@ base @ decimal source-id file-line (.) $tag-field base ! newline-string $tag-field ; +[then] : $make-header ( adr len voc-acf -- ) -rot ( voc-acf adr,len ) @@ -1938,6 +1942,10 @@ [then] +\ A place to put the last word returned by blword +0 value 'word + +[ifndef] omit-files \ From filecomm.fth decimal @@ -2167,9 +2175,6 @@ ; : close-file ( fd -- ior ) fclose 0 ; -\ A place to put the last word returned by blword -0 value 'word - headerless \ File descriptor allocation @@ -2237,6 +2242,7 @@ file @ false ; +[then] headerless \ A version that knows about multi-segment dictionaries can be installed @@ -2247,9 +2253,7 @@ defer .error# : (.error#) ( error# -- ) - dup d# -38 = if - ." The file '" opened-filename 2@ type ." ' cannot be opened." - else ." Error " . then + dup d# -38 = if .file-open-error else ." Error " . then ; : .abort ( -- ) @@ -2328,6 +2332,10 @@ : warm (s -- ) single sp0 @ sp! quit ; [then] +[ifdef] omit-files +: read-line ( adr len fd -- actual not-eof? error? ) 3drop 0 true ; +: .file-open-error ( -- ) ; +[else] \ From disk.fth \ High level interface to disk files. @@ -2560,6 +2568,10 @@ 2 /n-t * ualloc-t user opened-filename headers +: .file-open-error ( -- ) + ." The file '" opened-filename 2@ type ." ' cannot be opened." +; + : open-file ( adr len mode -- fd ior ) file @ >r \ Guard against re-entrancy @@ -2722,6 +2734,7 @@ then ( ior ) ; \ Missing: file-status, create-file, delete-file, resize-file, rename-file +[then] \ From cstrings.fth @@ -2929,6 +2942,13 @@ throw ; +defer prompt ( -- ) ' (prompt) is prompt + +defer quit ' (quit) is quit + +[ifdef] omit-files +: process-command-line ( -- ) ; +[else] : include-file ( fid -- ) /tib 4 + allocate throw ( fid adr ) save-input 2>r 2>r 2>r ( fid adr ) @@ -3004,10 +3024,6 @@ : null-environment? ( c-addr u -- false | i*x true ) 2drop false ; ' null-environment? is environment? -defer prompt ( -- ) ' (prompt) is prompt - -defer quit ' (quit) is quit - : fload fl ; : $report-name ( name$ -- name$ ) @@ -3072,6 +3088,8 @@ repeat bye ; +[then] + \ LICENSE_BEGIN \ Copyright (c) 2006 FirmWorks \ Modified: forth/kernel/sysio.fth =================================================================== --- forth/kernel/sysio.fth 2009-07-01 00:25:47 UTC (rev 1231) +++ forth/kernel/sysio.fth 2009-07-03 04:06:23 UTC (rev 1232) @@ -1,6 +1,9 @@ \ See license at end of file purpose: System I/O interfaces +[ifdef] omit-files +: install-disk-io ; +[else] \ From sysdisk.fth \ File I/O interface using the C wrapper program @@ -111,6 +114,7 @@ create lf-pstr 1 c, linefeed c, \ Unix create cr-pstr 1 c, carret c, \ Macintosh, OS-9 create crlf-pstr 2 c, carret c, linefeed c, \ DOS +[then] \ From syskey.fth

1 0

r1231 - cpu/x86/pc/olpc/via
by svn＠openfirmware.info 01 Jul '09

01 Jul '09

Author: wmb Date: 2009-07-01 02:25:47 +0200 (Wed, 01 Jul 2009) New Revision: 1231 Modified: cpu/x86/pc/olpc/via/acpi.fth cpu/x86/pc/olpc/via/rmstart.fth cpu/x86/pc/olpc/via/romreset.bth Log: Via - fixes to ACPI wakeup support. Modified: cpu/x86/pc/olpc/via/acpi.fth =================================================================== --- cpu/x86/pc/olpc/via/acpi.fth 2009-06-30 19:53:14 UTC (rev 1230) +++ cpu/x86/pc/olpc/via/acpi.fth 2009-07-01 00:25:47 UTC (rev 1231) @@ -248,25 +248,25 @@ then op: ax bx mov - h# 0f # ax and + h# 0f # ax and ax cx mov op: 4 # bx shr - cs: ax wake-adr la1+ #) mov \ Offset - cs: bx wake-adr wa1+ #) mov \ Segment - \ The following might be unnecessary ax ax xor rm-ds # al mov \ 16-bit data segment ax ds mov ax es mov ax ss mov - cr0 ax mov h# fe # al and ax cr0 mov \ Enter real mode + cx wake-adr la1+ #) mov \ Offset + bx wake-adr wa1+ #) mov \ Segment - here 5 + do-acpi-wake - wake-adr + >seg:off #) far jmp \ Jump to set cs + op: cr0 ax mov h# fe # al and op: ax cr0 mov \ Enter real mode + here 5 + do-acpi-wake - wake-adr + lwsplit #) far jmp \ Jump to set cs + \ The following might be unnecessary \ Now we are running in real mode; fix segments again cs ax mov ax ds mov ax es mov - cs: wake-adr wa1+ s#) far jmp + wake-adr wa1+ s#) far jmp end-code here do-acpi-wake - constant /do-acpi-wake @@ -292,7 +292,7 @@ " dsdt" find-drop-in 0= abort" No DSDT " ( adr len ) 2dup dsdt-adr swap move free-mem - do-acpi-wake wake-adr 4 + /do-acpi-wake move + do-acpi-wake wake-adr /do-acpi-wake move [ifdef] notdef \ Copy in the SSDT Modified: cpu/x86/pc/olpc/via/rmstart.fth =================================================================== --- cpu/x86/pc/olpc/via/rmstart.fth 2009-06-30 19:53:14 UTC (rev 1230) +++ cpu/x86/pc/olpc/via/rmstart.fth 2009-07-01 00:25:47 UTC (rev 1231) @@ -83,7 +83,7 @@ \ ffff.fc00 GDT - 1f w, ffff.fc00 l, 0 w, \ 0 Pointer to GDT in first slot + 2f w, ffff.fc00 l, 0 w, \ 0 Pointer to GDT in first slot 0 w, 0 l, 0 w, \ * Null descriptor ffff w, 9b.000000 l, 00.c.f w, \ 10 Code, linear=physical, full 4Gbytes ffff w, 93.000000 l, 00.c.f w, \ 18 Data, linear=physical, full 4Gbytes Modified: cpu/x86/pc/olpc/via/romreset.bth =================================================================== --- cpu/x86/pc/olpc/via/romreset.bth 2009-06-30 19:53:14 UTC (rev 1230) +++ cpu/x86/pc/olpc/via/romreset.bth 2009-07-01 00:25:47 UTC (rev 1231) @@ -179,7 +179,7 @@ \ Resume in real mode for ACPI operating systems \ Linear wakeup address is in EAX sp sp xor \ Possibly unnecessary - wake-adr >seg:off drop rm-cs #) far jmp + wake-adr lwsplit drop rm-cs #) far jmp else \ Resume in 32-bit protected mode for OFW resume-data # sp mov

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

openfirmware July 2009