OpenBIOS July 2013

openbios@openbios.org

13 participants
38 discussions

[commit] r1198 - trunk/openbios-devel/forth/device
by repository service 27 Jul '13

27 Jul '13

Author: mcayland Date: Sat Jul 27 15:17:49 2013 New Revision: 1198 URL: http://tracker.coreboot.org/trac/openbios/changeset/1198 Log: terminal.fs: fix handling of backspace (0x8) control code Annex B.2 of the IEEE1275 specification mentions that this code moves the cursor one position to the left on the current line (i.e. it shouldn't attempt to redraw any characters). Remove the character redraw code to bring in line with the specification which also has the side-effect of fixing the spinner used by quik. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/forth/device/terminal.fs Modified: trunk/openbios-devel/forth/device/terminal.fs ============================================================================== --- trunk/openbios-devel/forth/device/terminal.fs Sat Jul 27 15:17:47 2013 (r1197) +++ trunk/openbios-devel/forth/device/terminal.fs Sat Jul 27 15:17:49 2013 (r1198) @@ -240,10 +240,8 @@ endof 8 of \ BS column# 0<> if - column# dup - to column# - 20 draw-character 1- - to column# + column# 1- to column# + toggle-cursor exit then endof 9 of \ TAB

1 0

[commit] r1197 - trunk/openbios-devel/forth/device
by repository service 27 Jul '13

27 Jul '13

Author: mcayland Date: Sat Jul 27 15:17:47 2013 New Revision: 1197 URL: http://tracker.coreboot.org/trac/openbios/changeset/1197 Log: terminal.fs: fix handling of NULL (0x0) control code NULL is defined as a no-op, so make sure that we detect it and exit (term-emit) immediately. Otherwise we fall through to the default code which redraws the character and advances the column by 1. This fixes the staggered line output that appear in quik. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/forth/device/terminal.fs Modified: trunk/openbios-devel/forth/device/terminal.fs ============================================================================== --- trunk/openbios-devel/forth/device/terminal.fs Sat Jul 27 15:17:43 2013 (r1196) +++ trunk/openbios-devel/forth/device/terminal.fs Sat Jul 27 15:17:47 2013 (r1197) @@ -230,6 +230,9 @@ then case + 0 of \ NULL + toggle-cursor exit + endof 7 of \ BEL blink-screen s" /screen" s" ring-bell"

1 0

[commit] r1196 - trunk/openbios-devel/forth/device
by repository service 27 Jul '13

27 Jul '13

Author: mcayland Date: Sat Jul 27 15:17:43 2013 New Revision: 1196 URL: http://tracker.coreboot.org/trac/openbios/changeset/1196 Log: terminal.fs: fix accidental display of control characters and column position When processing a control code, make sure we exit (term-emit) immediately rather than falling through to the end of the function. Otherwise we still call draw-character and advance the column as per normal character codes. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/forth/device/terminal.fs Modified: trunk/openbios-devel/forth/device/terminal.fs ============================================================================== --- trunk/openbios-devel/forth/device/terminal.fs Sat Jul 27 15:17:41 2013 (r1195) +++ trunk/openbios-devel/forth/device/terminal.fs Sat Jul 27 15:17:43 2013 (r1196) @@ -249,6 +249,7 @@ else 8 + -8 and ff and to column# then + toggle-cursor exit endof a of \ LF line# 1+ to line# @@ -264,6 +265,7 @@ line# 0<> if line# 1- to line# then + toggle-cursor exit endof c of \ FF 0 to column# 0 to line# @@ -271,6 +273,7 @@ endof d of \ CR 0 to column# + toggle-cursor exit endof 1b of \ ESC 1b (sequence) c!

1 0

[commit] r1195 - in trunk/openbios-devel: drivers forth/device libopenbios
by repository service 27 Jul '13

27 Jul '13

Author: mcayland Date: Sat Jul 27 15:17:41 2013 New Revision: 1195 URL: http://tracker.coreboot.org/trac/openbios/changeset/1195 Log: video: rename qemu-video-* words to openbios-video-* Now that the second half of the display rework is complete, the qemu-video-* words are no longer QEMU-specific. This is because we now initialise the defaults to the value of the VGA_DEFAULT_* constants and only attempt to override them with the values supplied by the QEMU firmware interface if built with CONFIG_QEMU enabled. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/drivers/tcx.fs trunk/openbios-devel/drivers/vga.fs trunk/openbios-devel/forth/device/display.fs trunk/openbios-devel/libopenbios/video_common.c Modified: trunk/openbios-devel/drivers/tcx.fs ============================================================================== --- trunk/openbios-devel/drivers/tcx.fs Sat Jul 27 13:22:06 2013 (r1194) +++ trunk/openbios-devel/drivers/tcx.fs Sat Jul 27 15:17:41 2013 (r1195) @@ -12,28 +12,28 @@ \ and height, grab the ones passed in by QEMU/generated by OpenBIOS \ -: qemu-video-addr - " qemu-video-addr" $find if +: openbios-video-addr + " openbios-video-addr" $find if cell+ @ then ; -: qemu-video-width - " qemu-video-width" $find if +: openbios-video-width + " openbios-video-width" $find if cell+ @ then ; -: qemu-video-height - " qemu-video-height" $find if +: openbios-video-height + " openbios-video-height" $find if cell+ @ then ; : qemu-tcx-driver-install ( -- ) - qemu-video-addr to frame-buffer-adr + openbios-video-addr to frame-buffer-adr default-font set-font - qemu-video-width qemu-video-height over char-width / over char-height / + openbios-video-width openbios-video-height over char-width / over char-height / fb8-install ; Modified: trunk/openbios-devel/drivers/vga.fs ============================================================================== --- trunk/openbios-devel/drivers/vga.fs Sat Jul 27 13:22:06 2013 (r1194) +++ trunk/openbios-devel/drivers/vga.fs Sat Jul 27 15:17:41 2013 (r1195) @@ -12,28 +12,28 @@ \ and height, grab the ones passed in by QEMU/generated by OpenBIOS \ -: qemu-video-addr - " qemu-video-addr" $find if +: openbios-video-addr + " openbios-video-addr" $find if cell+ @ then ; -: qemu-video-width - " qemu-video-width" $find if +: openbios-video-width + " openbios-video-width" $find if cell+ @ then ; -: qemu-video-height - " qemu-video-height" $find if +: openbios-video-height + " openbios-video-height" $find if cell+ @ then ; : qemu-vga-driver-install ( -- ) - qemu-video-addr to frame-buffer-adr + openbios-video-addr to frame-buffer-adr default-font set-font - qemu-video-width qemu-video-height over char-width / over char-height / + openbios-video-width openbios-video-height over char-width / over char-height / fb8-install ; Modified: trunk/openbios-devel/forth/device/display.fs ============================================================================== --- trunk/openbios-devel/forth/device/display.fs Sat Jul 27 13:22:06 2013 (r1194) +++ trunk/openbios-devel/forth/device/display.fs Sat Jul 27 15:17:41 2013 (r1195) @@ -50,10 +50,10 @@ 0 value line-bytes 0 value display-ih -\ internal values read from QEMU firmware interface -0 value qemu-video-addr -0 value qemu-video-height -0 value qemu-video-width +\ internal values +0 value openbios-video-addr +0 value openbios-video-height +0 value openbios-video-width \ The following wordset is called the "defer word interface" of the \ terminal-emulator support package. It gets overloaded by fb1-install Modified: trunk/openbios-devel/libopenbios/video_common.c ============================================================================== --- trunk/openbios-devel/libopenbios/video_common.c Sat Jul 27 13:22:06 2013 (r1194) +++ trunk/openbios-devel/libopenbios/video_common.c Sat Jul 27 15:17:41 2013 (r1195) @@ -224,11 +224,11 @@ feval("['] display-ih cell+"); video.ih = cell2pointer(POP()); - feval("['] qemu-video-addr cell+"); + feval("['] openbios-video-addr cell+"); video.mvirt = cell2pointer(POP()); - feval("['] qemu-video-width cell+"); + feval("['] openbios-video-width cell+"); video.w = cell2pointer(POP()); - feval("['] qemu-video-height cell+"); + feval("['] openbios-video-height cell+"); video.h = cell2pointer(POP()); feval("['] depth-bits cell+"); video.depth = cell2pointer(POP());

1 0

[commit] r1194 - in trunk/openbios-devel: arch/amd64 arch/ppc arch/sparc64 arch/x86 config/examples drivers
by repository service 27 Jul '13

27 Jul '13

Author: mcayland Date: Sat Jul 27 13:22:06 2013 New Revision: 1194 URL: http://tracker.coreboot.org/trac/openbios/changeset/1194 Log: x86/SPARC64/PPC/amd64: switch VGA driver over to FCode Currently we cannot read the FCode from the card, so for the moment simply execute the bytecode directly. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/arch/amd64/build.xml trunk/openbios-devel/arch/amd64/init.fs trunk/openbios-devel/arch/ppc/build.xml trunk/openbios-devel/arch/ppc/ppc.fs trunk/openbios-devel/arch/sparc64/build.xml trunk/openbios-devel/arch/sparc64/init.fs trunk/openbios-devel/arch/sparc64/tree.fs trunk/openbios-devel/arch/x86/build.xml trunk/openbios-devel/arch/x86/init.fs trunk/openbios-devel/config/examples/amd64_config.xml trunk/openbios-devel/drivers/build.xml trunk/openbios-devel/drivers/pci.c trunk/openbios-devel/drivers/vga.fs Modified: trunk/openbios-devel/arch/amd64/build.xml ============================================================================== --- trunk/openbios-devel/arch/amd64/build.xml Sat Jul 27 13:22:02 2013 (r1193) +++ trunk/openbios-devel/arch/amd64/build.xml Sat Jul 27 13:22:06 2013 (r1194) @@ -1,5 +1,6 @@ <build condition="AMD64"> <dictionary name="openbios-amd64" init="openbios" target="forth"> <object source="init.fs"/> + <object source="QEMU,VGA.bin" target="fcode" condition="DRIVER_VGA" /> </dictionary> </build> Modified: trunk/openbios-devel/arch/amd64/init.fs ============================================================================== --- trunk/openbios-devel/arch/amd64/init.fs Sat Jul 27 13:22:02 2013 (r1193) +++ trunk/openbios-devel/arch/amd64/init.fs Sat Jul 27 13:22:06 2013 (r1194) @@ -1,3 +1,5 @@ +include config.fs + :noname ." Type 'help' for detailed information" cr \ ." boot secondary slave cdrom: " cr @@ -74,3 +76,8 @@ " keyboard" input ; CONSOLE-IN-initializer +\ Load VGA FCode driver blob +[IFDEF] CONFIG_DRIVER_VGA + -1 value vga-driver-fcode + " QEMU,VGA.bin" $encode-file to vga-driver-fcode +[THEN] Modified: trunk/openbios-devel/arch/ppc/build.xml ============================================================================== --- trunk/openbios-devel/arch/ppc/build.xml Sat Jul 27 13:22:02 2013 (r1193) +++ trunk/openbios-devel/arch/ppc/build.xml Sat Jul 27 13:22:06 2013 (r1194) @@ -5,24 +5,28 @@ <object source="ppc.fs"/> <object source="briq/tree.fs"/> <object source="briq/briq.fs"/> + <object source="QEMU,VGA.bin" target="fcode" condition="DRIVER_VGA"/> </dictionary> <dictionary name="openbios-pearpc" init="openbios" target="forth" condition="PEARPC"> <object source="ppc.fs"/> <object source="pearpc/tree.fs"/> <object source="pearpc/pearpc.fs"/> + <object source="QEMU,VGA.bin" target="fcode" condition="DRIVER_VGA"/> </dictionary> <dictionary name="openbios-qemu" init="openbios" target="forth" condition="QEMU"> <object source="ppc.fs"/> <object source="qemu/tree.fs"/> <object source="qemu/qemu.fs"/> + <object source="QEMU,VGA.bin" target="fcode" condition="DRIVER_VGA"/> </dictionary> <dictionary name="openbios-mol" init="openbios" target="forth" condition="MOL"> <object source="ppc.fs"/> <object source="mol/tree.fs"/> <object source="mol/mol.fs"/> + <object source="QEMU,VGA.bin" target="fcode" condition="DRIVER_VGA"/> </dictionary>  Modified: trunk/openbios-devel/arch/ppc/ppc.fs ============================================================================== --- trunk/openbios-devel/arch/ppc/ppc.fs Sat Jul 27 13:22:02 2013 (r1193) +++ trunk/openbios-devel/arch/ppc/ppc.fs Sat Jul 27 13:22:06 2013 (r1194) @@ -1,3 +1,5 @@ +include config.fs + \ ------------------------------------------------------------------------- \ registers \ ------------------------------------------------------------------------- @@ -50,6 +52,15 @@ 0 value %sprg3 \ ------------------------------------------------------------------------- +\ Load VGA FCode driver blob +\ ------------------------------------------------------------------------- + +[IFDEF] CONFIG_DRIVER_VGA + -1 value vga-driver-fcode + " QEMU,VGA.bin" $encode-file to vga-driver-fcode +[THEN] + +\ ------------------------------------------------------------------------- \ other \ ------------------------------------------------------------------------- Modified: trunk/openbios-devel/arch/sparc64/build.xml ============================================================================== --- trunk/openbios-devel/arch/sparc64/build.xml Sat Jul 27 13:22:02 2013 (r1193) +++ trunk/openbios-devel/arch/sparc64/build.xml Sat Jul 27 13:22:06 2013 (r1194) @@ -3,6 +3,7 @@ <dictionary name="openbios-sparc64" init="openbios"> <object source="tree.fs" target="forth"/> <object source="init.fs" target="forth"/> + <object source="QEMU,VGA.bin" target="fcode" condition="DRIVER_VGA"/> </dictionary> <library name="sparc64" type="static" target="target"> Modified: trunk/openbios-devel/arch/sparc64/init.fs ============================================================================== --- trunk/openbios-devel/arch/sparc64/init.fs Sat Jul 27 13:22:02 2013 (r1193) +++ trunk/openbios-devel/arch/sparc64/init.fs Sat Jul 27 13:22:06 2013 (r1194) @@ -53,3 +53,9 @@ : rmap@ ( virt -- rmentry ) drop 0 ; + +\ Load VGA FCode driver blob +[IFDEF] CONFIG_DRIVER_VGA + -1 value vga-driver-fcode + " QEMU,VGA.bin" $encode-file to vga-driver-fcode +[THEN] Modified: trunk/openbios-devel/arch/sparc64/tree.fs ============================================================================== --- trunk/openbios-devel/arch/sparc64/tree.fs Sat Jul 27 13:22:02 2013 (r1193) +++ trunk/openbios-devel/arch/sparc64/tree.fs Sat Jul 27 13:22:06 2013 (r1194) @@ -1,3 +1,5 @@ +include config.fs + \ ------------------------------------------------------------------------- \ UPA encode/decode unit \ ------------------------------------------------------------------------- Modified: trunk/openbios-devel/arch/x86/build.xml ============================================================================== --- trunk/openbios-devel/arch/x86/build.xml Sat Jul 27 13:22:02 2013 (r1193) +++ trunk/openbios-devel/arch/x86/build.xml Sat Jul 27 13:22:06 2013 (r1194) @@ -2,6 +2,7 @@ <dictionary name="openbios-x86" init="openbios"> <object source="init.fs" target="forth"/> + <object source="QEMU,VGA.bin" target="fcode" condition="DRIVER_VGA"/> </dictionary> <library name="x86" type="static" target="target"> Modified: trunk/openbios-devel/arch/x86/init.fs ============================================================================== --- trunk/openbios-devel/arch/x86/init.fs Sat Jul 27 13:22:02 2013 (r1193) +++ trunk/openbios-devel/arch/x86/init.fs Sat Jul 27 13:22:06 2013 (r1194) @@ -1,3 +1,5 @@ +include config.fs + :noname ." Type 'help' for detailed information" cr \ ." boot secondary slave cdrom: " cr @@ -74,3 +76,9 @@ :noname " keyboard" input ; CONSOLE-IN-initializer + +\ Load VGA FCode driver blob +[IFDEF] CONFIG_DRIVER_VGA + -1 value vga-driver-fcode + " QEMU,VGA.bin" $encode-file to vga-driver-fcode +[THEN] Modified: trunk/openbios-devel/config/examples/amd64_config.xml ============================================================================== --- trunk/openbios-devel/config/examples/amd64_config.xml Sat Jul 27 13:22:02 2013 (r1193) +++ trunk/openbios-devel/config/examples/amd64_config.xml Sat Jul 27 13:22:06 2013 (r1194) @@ -58,3 +58,4 @@ <option name="CONFIG_DRIVER_IDE" type="boolean" value="true"/> <option name="CONFIG_IDE_NUM_CHANNELS" type="integer" value="4"/> <option name="CONFIG_DEBUG_IDE" type="boolean" value="false"/> + <option name="CONFIG_DRIVER_VGA" type="boolean" value="false"/> Modified: trunk/openbios-devel/drivers/build.xml ============================================================================== --- trunk/openbios-devel/drivers/build.xml Sat Jul 27 13:22:02 2013 (r1193) +++ trunk/openbios-devel/drivers/build.xml Sat Jul 27 13:22:06 2013 (r1194) @@ -29,9 +29,9 @@ <object source="pci.fs" condition="DRIVER_PCI"/> <object source="sbus.fs" condition="DRIVER_SBUS"/> <object source="esp.fs" condition="DRIVER_ESP"/> - <object source="vga.fs" condition="DRIVER_VGA"/> </dictionary> <fcode source="tcx.fs" name="QEMU,tcx.bin" condition="DRIVER_SBUS" /> + <fcode source="vga.fs" name="QEMU,VGA.bin" condition="DRIVER_VGA" /> </build> Modified: trunk/openbios-devel/drivers/pci.c ============================================================================== --- trunk/openbios-devel/drivers/pci.c Sat Jul 27 13:22:02 2013 (r1193) +++ trunk/openbios-devel/drivers/pci.c Sat Jul 27 13:22:06 2013 (r1194) @@ -771,7 +771,8 @@ pci_bus_addr_to_host_addr(config->assigned[1] & ~0x0000000F), config->sizes[1]); - feval("['] qemu-vga-driver-init is-install"); + /* Currently we don't read FCode from the hardware but execute it directly */ + feval("['] vga-driver-fcode 2 cells + 1 byte-load"); } return 0; Modified: trunk/openbios-devel/drivers/vga.fs ============================================================================== --- trunk/openbios-devel/drivers/vga.fs Sat Jul 27 13:22:02 2013 (r1193) +++ trunk/openbios-devel/drivers/vga.fs Sat Jul 27 13:22:06 2013 (r1194) @@ -5,9 +5,42 @@ \ the QEMU VGA graphics card. \ -: qemu-vga-driver-init ( -- ) +fcode-version3 + +\ +\ Instead of using fixed values for the framebuffer address and the width +\ and height, grab the ones passed in by QEMU/generated by OpenBIOS +\ + +: qemu-video-addr + " qemu-video-addr" $find if + cell+ @ + then +; + +: qemu-video-width + " qemu-video-width" $find if + cell+ @ + then +; + +: qemu-video-height + " qemu-video-height" $find if + cell+ @ + then +; + +: qemu-vga-driver-install ( -- ) qemu-video-addr to frame-buffer-adr default-font set-font qemu-video-width qemu-video-height over char-width / over char-height / fb8-install ; + +: qemu-vga-driver-init + ['] qemu-vga-driver-install is-install + ; + +qemu-vga-driver-init + +end0

1 0

[commit] r1193 - in trunk/openbios-devel: arch/sparc32 drivers
by repository service 27 Jul '13

27 Jul '13

Author: mcayland Date: Sat Jul 27 13:22:02 2013 New Revision: 1193 URL: http://tracker.coreboot.org/trac/openbios/changeset/1193 Log: SPARC32: switch TCX driver over to FCode Currently we cannot read the FCode from the card, so for the moment simply execute the bytecode directly. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/arch/sparc32/build.xml trunk/openbios-devel/arch/sparc32/init.fs trunk/openbios-devel/arch/sparc32/tree.fs trunk/openbios-devel/drivers/build.xml trunk/openbios-devel/drivers/sbus.c trunk/openbios-devel/drivers/tcx.fs Modified: trunk/openbios-devel/arch/sparc32/build.xml ============================================================================== --- trunk/openbios-devel/arch/sparc32/build.xml Sat Jul 27 13:21:59 2013 (r1192) +++ trunk/openbios-devel/arch/sparc32/build.xml Sat Jul 27 13:22:02 2013 (r1193) @@ -3,6 +3,7 @@ <dictionary name="openbios-sparc32" init="openbios"> <object source="tree.fs" target="forth"/> <object source="init.fs" target="forth"/> + <object source="QEMU,tcx.bin" target="fcode" condition="DRIVER_SBUS"/> </dictionary> <library name="sparc32" type="static" target="target"> Modified: trunk/openbios-devel/arch/sparc32/init.fs ============================================================================== --- trunk/openbios-devel/arch/sparc32/init.fs Sat Jul 27 13:21:59 2013 (r1192) +++ trunk/openbios-devel/arch/sparc32/init.fs Sat Jul 27 13:22:02 2013 (r1193) @@ -45,3 +45,9 @@ : obmem ( -- space ) 0 ; + +\ Load TCX FCode driver blob +[IFDEF] CONFIG_DRIVER_SBUS + -1 value tcx-driver-fcode + " QEMU,tcx.bin" $encode-file to tcx-driver-fcode +[THEN] Modified: trunk/openbios-devel/arch/sparc32/tree.fs ============================================================================== --- trunk/openbios-devel/arch/sparc32/tree.fs Sat Jul 27 13:21:59 2013 (r1192) +++ trunk/openbios-devel/arch/sparc32/tree.fs Sat Jul 27 13:22:02 2013 (r1193) @@ -1,3 +1,4 @@ +include config.fs " /" find-device 2 encode-int " #address-cells" property Modified: trunk/openbios-devel/drivers/build.xml ============================================================================== --- trunk/openbios-devel/drivers/build.xml Sat Jul 27 13:21:59 2013 (r1192) +++ trunk/openbios-devel/drivers/build.xml Sat Jul 27 13:22:02 2013 (r1193) @@ -29,8 +29,9 @@ <object source="pci.fs" condition="DRIVER_PCI"/> <object source="sbus.fs" condition="DRIVER_SBUS"/> <object source="esp.fs" condition="DRIVER_ESP"/> - <object source="tcx.fs" condition="DRIVER_SBUS"/> <object source="vga.fs" condition="DRIVER_VGA"/> </dictionary> + <fcode source="tcx.fs" name="QEMU,tcx.bin" condition="DRIVER_SBUS" /> + </build> Modified: trunk/openbios-devel/drivers/sbus.c ============================================================================== --- trunk/openbios-devel/drivers/sbus.c Sat Jul 27 13:21:59 2013 (r1192) +++ trunk/openbios-devel/drivers/sbus.c Sat Jul 27 13:22:02 2013 (r1193) @@ -342,7 +342,10 @@ } bind_func("hw-set-color", tcx_hw_set_color); - feval("['] qemu-tcx-driver-init is-install"); + + /* Currently we don't have an SBus probe routine, so execute FCode + directly */ + feval("['] tcx-driver-fcode 2 cells + 1 byte-load"); chosen = find_dev("/chosen"); push_str(path); Modified: trunk/openbios-devel/drivers/tcx.fs ============================================================================== --- trunk/openbios-devel/drivers/tcx.fs Sat Jul 27 13:21:59 2013 (r1192) +++ trunk/openbios-devel/drivers/tcx.fs Sat Jul 27 13:22:02 2013 (r1193) @@ -5,9 +5,42 @@ \ the QEMU TCX graphics card. \ -: qemu-tcx-driver-init ( -- ) +fcode-version3 + +\ +\ Instead of using fixed values for the framebuffer address and the width +\ and height, grab the ones passed in by QEMU/generated by OpenBIOS +\ + +: qemu-video-addr + " qemu-video-addr" $find if + cell+ @ + then +; + +: qemu-video-width + " qemu-video-width" $find if + cell+ @ + then +; + +: qemu-video-height + " qemu-video-height" $find if + cell+ @ + then +; + +: qemu-tcx-driver-install ( -- ) qemu-video-addr to frame-buffer-adr default-font set-font qemu-video-width qemu-video-height over char-width / over char-height / fb8-install ; + +: qemu-tcx-driver-init + ['] qemu-tcx-driver-install is-install +; + +qemu-tcx-driver-init + +end0

1 0

[commit] r1192 - in trunk/openbios-devel: . config/xml
by repository service 27 Jul '13

27 Jul '13

Author: mcayland Date: Sat Jul 27 13:21:59 2013 New Revision: 1192 URL: http://tracker.coreboot.org/trac/openbios/changeset/1192 Log: config: add new fcode tag and support for building Fcode into dictionaries Here we introduce a new <fcode> tag which will tokenise the specified source file into Fcode using the toke utility. Similarly add a new type attribute to the dictionary <object> tag which when set to "fcode" will add the fcode binary as a dependency for the specified target dictionary. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Added: trunk/openbios-devel/config/xml/fcode.xsl Modified: trunk/openbios-devel/Makefile.target trunk/openbios-devel/config/xml/dictionary.xsl trunk/openbios-devel/config/xml/makefile.xsl trunk/openbios-devel/config/xml/rules.xml Modified: trunk/openbios-devel/Makefile.target ============================================================================== --- trunk/openbios-devel/Makefile.target Sat Jul 27 13:21:56 2013 (r1191) +++ trunk/openbios-devel/Makefile.target Sat Jul 27 13:21:59 2013 (r1192) @@ -35,6 +35,9 @@ INCLUDES := -I$(SRCDIR)/include -I$(SRCDIR)/kernel/include -I$(ODIR)/target/include AS_FLAGS+= -g +# FCode tokeniser +TOKE := toke + quiet-command = $(if $(V),$1,$(if $(2),@echo $2 && $1, @$1)) VPATH_SUFFIXES = %.c %.h %.S %.fs Modified: trunk/openbios-devel/config/xml/dictionary.xsl ============================================================================== --- trunk/openbios-devel/config/xml/dictionary.xsl Sat Jul 27 13:21:56 2013 (r1191) +++ trunk/openbios-devel/config/xml/dictionary.xsl Sat Jul 27 13:21:59 2013 (r1192) @@ -53,16 +53,23 @@ </xsl:variable> <xsl:if test="$conditions=0"> - <xsl:value-of select="$dictname"/><xsl:text>-DICTIONARY:=$(</xsl:text> - <xsl:value-of select="$dictname"/><xsl:text>-DICTIONARY) </xsl:text> - <xsl:value-of select="$path"/> - <xsl:value-of select="@source"/> - <xsl:text>
</xsl:text> + <xsl:variable name="source"><xsl:value-of select="@source" /></xsl:variable> + +  + <xsl:if test="not(@target = 'fcode')"> + <xsl:value-of select="$dictname"/><xsl:text>-DICTIONARY:=$(</xsl:text> + <xsl:value-of select="$dictname"/><xsl:text>-DICTIONARY) </xsl:text> + + <xsl:value-of select="$path"/> + <xsl:value-of select="$source"/> + <xsl:text>
</xsl:text> + </xsl:if> + </xsl:if> </xsl:for-each> - <xsl:text>
</xsl:text> + <xsl:text>

</xsl:text>  <xsl:for-each select="//dictionary"> @@ -92,6 +99,27 @@ <xsl:if test="$init!=''"> <xsl:text> $(ODIR)/</xsl:text><xsl:value-of select="$init"/><xsl:text>.dict</xsl:text> </xsl:if> + +  + <xsl:for-each select="object[@target = 'fcode']"> + + <xsl:variable name="conditions"> + <xsl:text>0</xsl:text> + <xsl:for-each select="(ancestor-or-self::*)[@condition!='']"> + <xsl:call-template name="resolve-condition"> + <xsl:with-param select="@condition" name="expression"/> + </xsl:call-template> + </xsl:for-each> + </xsl:variable> + + <xsl:if test="$conditions = 0"> + + <xsl:text> $(ODIR)/</xsl:text> + <xsl:value-of select="@source"/> + + </xsl:if> + </xsl:for-each> + <xsl:text>
</xsl:text>  <xsl:text>	$(call quiet-command,$(ODIR)/forthstrap</xsl:text> Added: trunk/openbios-devel/config/xml/fcode.xsl ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/openbios-devel/config/xml/fcode.xsl Sat Jul 27 13:21:59 2013 (r1192) @@ -0,0 +1,48 @@ +<?xml version="1.0" encoding="ISO-8859-15" ?> + +<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"> + + <xsl:template match="/" mode="fcode"> + + <xsl:text>
#
# fcode rules
#

</xsl:text> + +  + <xsl:for-each select="//fcode"> + <xsl:variable name="outer-conditions"> + <xsl:text>0</xsl:text> + <xsl:for-each select="(ancestor-or-self::*)[@condition!='']"> + <xsl:call-template name="resolve-condition"> + <xsl:with-param select="@condition" name="expression"/> + </xsl:call-template> + </xsl:for-each> + </xsl:variable> + + <xsl:if test="$outer-conditions = 0"> + <xsl:if test="(ancestor-or-self::*)"> + + <xsl:variable name="path"> + <xsl:for-each select="ancestor::build"> + <xsl:call-template name="get-dirname"> + <xsl:with-param select="@base" name="path"/> + </xsl:call-template> + </xsl:for-each> + </xsl:variable> + +  + <xsl:text>$(ODIR)/</xsl:text> + <xsl:value-of select="@name"/> + <xsl:text>:</xsl:text> + + <xsl:text> $(SRCDIR)/</xsl:text> + <xsl:value-of select="$path"/> + <xsl:value-of select="@source"/> + +  + <xsl:value-of select="document('rules.xml',.)//rule[@target='host'][@entity='fcode']"/> + <xsl:text>
</xsl:text> + </xsl:if> + </xsl:if> + </xsl:for-each> + + </xsl:template> +</xsl:stylesheet> Modified: trunk/openbios-devel/config/xml/makefile.xsl ============================================================================== --- trunk/openbios-devel/config/xml/makefile.xsl Sat Jul 27 13:21:56 2013 (r1191) +++ trunk/openbios-devel/config/xml/makefile.xsl Sat Jul 27 13:21:59 2013 (r1192) @@ -5,10 +5,12 @@ <xsl:include href="util.xsl"/> <xsl:include href="dictionary.xsl"/> <xsl:include href="object.xsl"/> + <xsl:include href="fcode.xsl"/> <xsl:template match="/"> <xsl:value-of select="document('rules.xml',.)/rules/pre"/> <xsl:apply-templates select="." mode="dictionaries"/> + <xsl:apply-templates select="." mode="fcode"/> <xsl:apply-templates select="." mode="objects"/> </xsl:template> Modified: trunk/openbios-devel/config/xml/rules.xml ============================================================================== --- trunk/openbios-devel/config/xml/rules.xml Sat Jul 27 13:21:56 2013 (r1191) +++ trunk/openbios-devel/config/xml/rules.xml Sat Jul 27 13:21:59 2013 (r1192) @@ -13,6 +13,9 @@ <rule target="host" entity="library"> $(call quiet--command,$(AR) cru $@ $^; $(RANLIB) $@," HOSTAR $(TARGET_DIR)$@") </rule> +<rule target="host" entity="fcode"> + $(call quiet-command,$(TOKE) -o $@ $^," TOKE $(TARGET_DIR)$@") +</rule>  <rule target="target" entity="executable">

1 0

[commit] r1191 - trunk/openbios-devel/config/scripts
by repository service 27 Jul '13

27 Jul '13

Author: mcayland Date: Sat Jul 27 13:21:56 2013 New Revision: 1191 URL: http://tracker.coreboot.org/trac/openbios/changeset/1191 Log: switch-arch: make the fcode-utils tokeniser "toke" mandatory for the build Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/config/scripts/switch-arch Modified: trunk/openbios-devel/config/scripts/switch-arch ============================================================================== --- trunk/openbios-devel/config/scripts/switch-arch Sat Jul 27 12:15:11 2013 (r1190) +++ trunk/openbios-devel/config/scripts/switch-arch Sat Jul 27 13:21:56 2013 (r1191) @@ -117,6 +117,11 @@ echo "<option name=\"$option\" type=\"boolean\" value=\"true\" />" } +exists() +{ + type "$1" >/dev/null 2>&1 +} + SRCDIR=`dirname "$0"`/../.. BUILDDIR=`pwd` @@ -132,6 +137,13 @@ echo "Configuring OpenBIOS on $HOSTARCH for $*" +if exists toke; then + : +else + echo "Unable to locate toke executable from the fcode-utils package - aborting" + exit 1 +fi + target_list="" for target in $*; do case $target in

1 0

Re: [OpenBIOS] Secure BIOS for voting?
by SAVIOCvs＠aol.com 27 Jul '13

27 Jul '13

Thanks to all who commented on this thread. It seems clear that OpenBIOS won't enhance voting security. Special thanks to _tarl-b2(a)tarl.net_ (mailto:tarl-b2@tarl.net) for the tip on "trusted boot". That hardware/firmware solution appears to go a long way toward preventing any tampering with BIOS. It isn't really necessary to have a voting system that is impossible to subvert, as long as there are techniques like buying absentee ballots, gerrymandering and preventing certain groups from voting that are far easier to implement or provide far more votes per dollar. Chuck Gaston In a message dated 7/23/2013 4:28:55 P.M. Eastern Daylight Time, tarl-b2(a)tarl.net writes: On 2013-Jul-23 16:15 , Mark Morgan Lloyd wrote: >>> >> >> And having the USB keyboard work (which means USB HID support, USB hub >> support, USB controller support, PCI support, etc). > > Although IIRC there's a simplified protocol for the keyboard, > specifically for BIOS support. I've seen people discussing that in the > context of devices such as the Parallax Propeller which don't really > have USB support. Not for USB. Whatever they may be talking about, they aren't getting USB - there's no real way to enable EHCI/OHCI/UHCI/XHCI without implementing the entire shebang. >> >> Once the control of the hardware has been taken over, there is no way >> to take it back. > > > Or put another way, you might /think/ you've regained full control, > but you can never /know/ :-) The problem of secure execution is fairly well understood. Google "Verified Boot" or "Trusted Boot". The implementations that take it seriously do verification of their PROM, sign it, and the hardware won't let you start unless the PROM is good. Then the PROM verifies the signature of each component as it's brought in (I was recently involved in implementing public key verification for such). It doesn't guarantee bug-free code, but it verifies that the code you are running is what you think it is. -- OpenBIOS http://openbios.org/ Mailinglist: http://lists.openbios.org/mailman/listinfo Free your System - May the Forth be with you

1 0

[commit] r1190 - in trunk/openbios-devel/arch: sparc32 sparc64
by repository service 27 Jul '13

27 Jul '13

Author: mcayland Date: Sat Jul 27 12:15:11 2013 New Revision: 1190 URL: http://tracker.coreboot.org/trac/openbios/changeset/1190 Log: SPARC: remove cls() from the console startup The video_cls() function is no longer needed, since the fb8-install routines now handle the video initialisation instead. Remove the serial_cls() functions to make SPARC consistent with PPC and aid debugging. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/arch/sparc32/boot.h trunk/openbios-devel/arch/sparc32/console.c trunk/openbios-devel/arch/sparc32/openbios.c trunk/openbios-devel/arch/sparc64/console.c trunk/openbios-devel/arch/sparc64/openbios.c Modified: trunk/openbios-devel/arch/sparc32/boot.h ============================================================================== --- trunk/openbios-devel/arch/sparc32/boot.h Sat Jul 27 12:15:08 2013 (r1189) +++ trunk/openbios-devel/arch/sparc32/boot.h Sat Jul 27 12:15:11 2013 (r1190) @@ -22,9 +22,6 @@ extern unsigned int qemu_mem_size; extern void collect_sys_info(struct sys_info *info); -// console.c -void cls(void); - // romvec.c extern struct linux_arguments_v0 obp_arg; extern const void *romvec; Modified: trunk/openbios-devel/arch/sparc32/console.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/console.c Sat Jul 27 12:15:08 2013 (r1189) +++ trunk/openbios-devel/arch/sparc32/console.c Sat Jul 27 12:15:11 2013 (r1190) @@ -12,8 +12,6 @@ #include "libopenbios/ofmem.h" #include "libopenbios/video.h" -void cls(void); - #ifdef CONFIG_DEBUG_CONSOLE /* ****************************************************************** @@ -30,11 +28,6 @@ unsigned char *vmem; volatile uint32_t *dac; -static void video_cls(void) -{ - memset((void *)vmem, 0, VMEM_SIZE); -} - void tcx_init(uint64_t base) { vmem = (unsigned char *)ofmem_map_io(base + VMEM_BASE, VMEM_SIZE); @@ -97,15 +90,4 @@ return 0; } -void cls(void) -{ -#ifdef CONFIG_DEBUG_CONSOLE_SERIAL - serial_cls(); -#endif -#ifdef CONFIG_DEBUG_CONSOLE_VIDEO - video_cls(); -#endif -} - - #endif // CONFIG_DEBUG_CONSOLE Modified: trunk/openbios-devel/arch/sparc32/openbios.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/openbios.c Sat Jul 27 12:15:08 2013 (r1189) +++ trunk/openbios-devel/arch/sparc32/openbios.c Sat Jul 27 12:15:11 2013 (r1190) @@ -971,8 +971,6 @@ tcx_init(hwdef->tcx_base); kbd_init(hwdef->ms_kb_base); #endif - /* Clear the screen. */ - cls(); #endif collect_sys_info(&sys_info); Modified: trunk/openbios-devel/arch/sparc64/console.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/console.c Sat Jul 27 12:15:08 2013 (r1189) +++ trunk/openbios-devel/arch/sparc64/console.c Sat Jul 27 12:15:11 2013 (r1190) @@ -58,16 +58,4 @@ return 0; } -void cls(void) -{ -#ifdef CONFIG_DEBUG_CONSOLE_SERIAL - serial_putchar(27); - serial_putchar('['); - serial_putchar('H'); - serial_putchar(27); - serial_putchar('['); - serial_putchar('J'); -#endif -} - #endif // CONFIG_DEBUG_CONSOLE Modified: trunk/openbios-devel/arch/sparc64/openbios.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/openbios.c Sat Jul 27 12:15:08 2013 (r1189) +++ trunk/openbios-devel/arch/sparc64/openbios.c Sat Jul 27 12:15:11 2013 (r1190) @@ -619,8 +619,6 @@ #ifdef CONFIG_DEBUG_CONSOLE_SERIAL uart_init(CONFIG_SERIAL_PORT, CONFIG_SERIAL_SPEED); #endif - /* Clear the screen. */ - cls(); printk("OpenBIOS for Sparc64\n"); #endif

1 0