Author: wmb Date: 2008-08-28 11:05:31 +0200 (Thu, 28 Aug 2008) New Revision: 893
Modified: cpu/x86/pc/linux.fth cpu/x86/pc/olpc/fw.bth cpu/x86/pc/olpc/gui.fth Log: Added "linux-hook" and used it for last-second cleanup instead of go-hook, so that Linux-specific cleanups don't interfere with other client programs.
Modified: cpu/x86/pc/linux.fth =================================================================== --- cpu/x86/pc/linux.fth 2008-08-28 09:03:16 UTC (rev 892) +++ cpu/x86/pc/linux.fth 2008-08-28 09:05:31 UTC (rev 893) @@ -16,6 +16,8 @@ \ " ro root=mtd0 rootfstype=jffs2 console=ttyS0,115200 console=tty0" \ ' boot-file set-config-string-default
+defer linux-hook ' noop to linux-hook + 0 value ramdisk-adr 0 value /ramdisk
@@ -147,6 +149,7 @@ linux-base linux-params (init-program) linux-params to %esi make-ofw-pdir + linux-hook ;
d# 256 buffer: ramdisk-buf
Modified: cpu/x86/pc/olpc/fw.bth =================================================================== --- cpu/x86/pc/olpc/fw.bth 2008-08-28 09:03:16 UTC (rev 892) +++ cpu/x86/pc/olpc/fw.bth 2008-08-28 09:05:31 UTC (rev 893) @@ -219,6 +219,7 @@ devalias nfs net//obp-tftp:last//nfs
fload ${BP}/cpu/x86/pc/boot.fth +fload ${BP}/cpu/x86/pc/linux.fth
: usb-port-power-map ( -- n ) board-revision h# b10 h# b2f between if \ B1 and B2 @@ -308,11 +309,11 @@ \ fload ${BP}/ofw/gui/insticon.fth
[ifdef] olpc -: setup-for-os ( -- ) - [ ' go-hook behavior compile, ] \ Chain to old behavior +: setup-for-linux ( -- ) + [ ' linux-hook behavior compile, ] \ Chain to old behavior vpci-devices-on \ Do this after quieting USB ; -' setup-for-os to go-hook +' setup-for-linux to linux-hook
fload ${BP}/cpu/x86/pc/olpc/gui.fth fload ${BP}/cpu/x86/pc/olpc/suspend.fth \ Suspend/resume setup @@ -324,8 +325,8 @@ fload ${BP}/cpu/x86/pc/olpc/crypto.fth \ Cryptographic image validation fload ${BP}/cpu/x86/pc/olpc/lzip.fth \ Access zip images from memory fload ${BP}/cpu/x86/pc/olpc/gamekeys.fth -fload ${BP}/cpu/x86/pc/linux.fth fload ${BP}/cpu/x86/pc/olpc/memtest.fth +: emacs " rom:emacs" $boot ;
fload ${BP}/cpu/x86/pc/rmtools.fth fload ${BP}/dev/geode/smi.fth
Modified: cpu/x86/pc/olpc/gui.fth =================================================================== --- cpu/x86/pc/olpc/gui.fth 2008-08-28 09:03:16 UTC (rev 892) +++ cpu/x86/pc/olpc/gui.fth 2008-08-28 09:05:31 UTC (rev 893) @@ -312,10 +312,13 @@ then
cursor-off ['] fix-cursor to (ok) \ hide text cursor - avoid-logo + + 0 to image-width 0 to image-height \ In case $show-bmp fails
- 0 to image-width 0 to image-height \ In case $show-bmp fails [ifdef] old-way +\ The graphical boot sequence display at the top of the screen +\ has been superseded by the new secure pretty-boot scheme . + avoid-logo " rom:olpc.565" $show&advance [then]
@@ -390,15 +393,15 @@ : dcon-freeze ( -- ) 0 " set-source" $call-screen d# 30 ms ; : dcon-unfreeze ( -- ) 1 " set-source" $call-screen d# 30 ms ;
-: go-hook-unfreeze - [ ' go-hook behavior compile, ] +: linux-hook-unfreeze + [ ' linux-hook behavior compile, ] ; -: go-hook-freeze - [ ' go-hook behavior compile, ] +: linux-hook-freeze + [ ' linux-hook behavior compile, ] 0 " set-source" $call-screen ; -: freeze ( -- ) ['] go-hook-freeze to go-hook ; -: unfreeze ( -- ) ['] go-hook-unfreeze to go-hook ; +: freeze ( -- ) ['] linux-hook-freeze to linux-hook ; +: unfreeze ( -- ) ['] linux-hook-unfreeze to linux-hook ;
\ LICENSE_BEGIN \ Copyright (c) 2006 FirmWorks