OpenBIOS February 2008

openbios@openbios.org

4 participants
18 discussions

Probe missing on W49F002U
by Jun Ma 29 Feb '08

29 Feb '08

Hi, all. I downloaded flashrom from http://www.openbios.org/viewvc/trunk/util/flashrom.tar.gz?view=tar, also it was built correctly, when I scp it to an SIS530/SIS5595 board with debian-4.0r2, it just can't recognize my Winbond W49G002U EEPROM, here comes the verbose log: Sis530:~# ./flashrom -c W49F002U Calibrating delay loop... OK. No coreboot table found. Found chipset "SIS5595", enabling flash write... OK. No EEPROM/flash device found. Sis530:~# ./flashrom -R flashrom r Sis530:~# ./flashrom --version flashrom r Sis530:~# ./flashrom -V -r Calibrating delay loop... 59M loops per second. OK. No coreboot table found. Found chipset "SIS5595", enabling flash write... OK. Probing for Am29F040B, 512 KB probe_29f040b: id1 0xff, id2 0xff Probing for Am29LV040B, 512 KB probe_29f040b: id1 0xff, id2 0xff Probing for Am29F016D, 2048 KB probe_29f040b: id1 0xff, id2 0xff Probing for AE49F2008, 256 KB probe_jedec: id1 0xff, id2 0xff Probing for At29C040A, 512 KB probe_jedec: id1 0xff, id2 0xff Probing for At29C020, 256 KB probe_jedec: id1 0xff, id2 0xff Probing for At49F002(N), 256 KB probe_jedec: id1 0xff, id2 0xff Probing for At49F002(N)T, 256 KB probe_jedec: id1 0xff, id2 0xff Probing for EN29F002(A)(N)T, 256 KB probe_jedec: id1 0xff, id2 0xff Probing for EN29F002(A)(N)B, 256 KB probe_jedec: id1 0xff, id2 0xff Probing for MBM29F400TC, 512 KB probe_m29f400bt: id1 0xff, id2 0xff Probing for MX29F002, 256 KB probe_29f002: id1 0xff, id2 0xff Probing for MX25L4005, 512 KB generic_spi_command called, but no SPI chipset detected Probing for MX25L8005, 1024 KB generic_spi_command called, but no SPI chipset detected Probing for MX25L3205, 4096 KB generic_spi_command called, but no SPI chipset detected Probing for S25FL016A, 2048 KB generic_spi_command called, but no SPI chipset detected Probing for SST25VF040B, 512 KB generic_spi_command called, but no SPI chipset detected Probing for SST25VF016B, 2048 KB generic_spi_command called, but no SPI chipset detected Probing for SST29EE020A, 256 KB probe_jedec: id1 0xff, id2 0xff Probing for SST28SF040A, 512 KB probe_28sf040: id1 0xff, id2 0xff Probing for SST39SF010A, 128 KB probe_jedec: id1 0xff, id2 0xff Probing for SST39SF020A, 256 KB probe_jedec: id1 0xff, id2 0xff Probing for SST39SF040, 512 KB probe_jedec: id1 0xff, id2 0xff Probing for SST39VF020, 256 KB probe_jedec: id1 0xff, id2 0xff Probing for SST49LF040B, 512 KB probe_jedec: id1 0xff, id2 0xff Probing for SST49LF040, 512 KB probe_jedec: id1 0xff, id2 0xff Probing for SST49LF020A, 256 KB probe_jedec: id1 0xff, id2 0xff Probing for SST49LF080A, 1024 KB probe_jedec: id1 0xff, id2 0xff Probing for SST49LF002A/B, 256 KB probe_jedec: id1 0xff, id2 0xff Probing for SST49LF003A/B, 384 KB probe_jedec: id1 0xff, id2 0xff Probing for SST49LF004A/B, 512 KB probe_jedec: id1 0xff, id2 0xff Probing for SST49LF008A, 1024 KB probe_jedec: id1 0xff, id2 0xff Probing for SST49LF004C, 512 KB probe_49lfxxxc: id1 0xff, id2 0xff Probing for SST49LF008C, 1024 KB probe_49lfxxxc: id1 0xff, id2 0xff Probing for SST49LF016C, 2048 KB probe_49lfxxxc: id1 0xff, id2 0xff Probing for SST49LF160C, 2048 KB probe_49lfxxxc: id1 0xff, id2 0xff Probing for Pm49FL002, 256 KB probe_jedec: id1 0xff, id2 0xff Probing for Pm49FL004, 512 KB probe_jedec: id1 0xff, id2 0xff Probing for Pm25LV512, 64 KB generic_spi_command called, but no SPI chipset detected Probing for Pm25LV010, 128 KB generic_spi_command called, but no SPI chipset detected Probing for Pm25LV020, 256 KB generic_spi_command called, but no SPI chipset detected Probing for Pm25LV040, 512 KB generic_spi_command called, but no SPI chipset detected Probing for Pm25LV080B, 1024 KB generic_spi_command called, but no SPI chipset detected Probing for Pm25LV016B, 2048 KB generic_spi_command called, but no SPI chipset detected Probing for W29C011, 128 KB probe_jedec: id1 0xff, id2 0xff Probing for W29C040P, 512 KB probe_jedec: id1 0xff, id2 0xff Probing for W29C020C, 256 KB probe_jedec: id1 0xff, id2 0xff Probing for W29EE011, 128 KB probe_w29ee011: id1 0xff, id2 0xff Probing for W49F002U, 256 KB probe_jedec: id1 0xff, id2 0xff Probing for W49V002A, 256 KB probe_jedec: id1 0xff, id2 0xff Probing for W49V002FA, 256 KB probe_jedec: id1 0xff, id2 0xff Probing for W39V040FA, 512 KB probe_jedec: id1 0xff, id2 0xff Probing for W39V040A, 512 KB probe_jedec: id1 0xff, id2 0xff Probing for W39V040B, 512 KB probe_jedec: id1 0xff, id2 0xff Probing for W39V080A, 1024 KB probe_jedec: id1 0xff, id2 0xff Probing for W25x10, 128 KB generic_spi_command called, but no SPI chipset detected Probing for W25x20, 256 KB generic_spi_command called, but no SPI chipset detected Probing for W25x40, 512 KB generic_spi_command called, but no SPI chipset detected Probing for W25x80, 1024 KB generic_spi_command called, but no SPI chipset detected Probing for M29F002B, 256 KB probe_jedec: id1 0xff, id2 0xff Probing for M50FW040, 512 KB probe_jedec: id1 0xff, id2 0xff Probing for M29W040B, 512 KB probe_jedec: id1 0xff, id2 0xff Probing for M29F002T/NT, 256 KB probe_jedec: id1 0xff, id2 0xff Probing for M29F400BT, 512 KB probe_m29f400bt: id1 0xff, id2 0xff Probing for M50FLW040A, 512 KB probe_jedec: id1 0xff, id2 0xff Probing for M50FLW040B, 512 KB probe_jedec: id1 0xff, id2 0xff Probing for M50FLW080A, 1024 KB probe_jedec: id1 0xff, id2 0xff Probing for M50FLW080B, 1024 KB probe_jedec: id1 0xff, id2 0xff Probing for M50FW080, 1024 KB probe_jedec: id1 0xff, id2 0xff Probing for M50FW016, 2048 KB probe_jedec: id1 0xff, id2 0xff Probing for M50LPW116, 2048 KB probe_jedec: id1 0xff, id2 0xff Probing for M29W010B, 128 KB probe_jedec: id1 0xff, id2 0xff Probing for M29F040B, 512 KB probe_29f040b: id1 0xff, id2 0xff Probing for M25P05-A, 64 KB generic_spi_command called, but no SPI chipset detected Probing for M25P10-A, 128 KB generic_spi_command called, but no SPI chipset detected Probing for M25P20, 256 KB generic_spi_command called, but no SPI chipset detected Probing for M25P40, 512 KB generic_spi_command called, but no SPI chipset detected Probing for M25P80, 1024 KB generic_spi_command called, but no SPI chipset detected Probing for M25P16, 2048 KB generic_spi_command called, but no SPI chipset detected Probing for M25P32, 4096 KB generic_spi_command called, but no SPI chipset detected Probing for M25P64, 8192 KB generic_spi_command called, but no SPI chipset detected Probing for M25P128, 16384 KB generic_spi_command called, but no SPI chipset detected Probing for 82802ab, 512 KB probe_82802ab: id1 0xff, id2 0xff Probing for 82802ac, 1024 KB probe_82802ab: id1 0xff, id2 0xff Probing for F49B002UA, 256 KB probe_jedec: id1 0xff, id2 0xff Probing for LHF00L04, 1024 KB probe_lhf00l04: id1 0xff, id2 0xff Probing for S29C51001T, 128 KB probe_jedec: id1 0xff, id2 0xff Probing for S29C51002T, 256 KB probe_jedec: id1 0xff, id2 0xff Probing for S29C51004T, 512 KB probe_jedec: id1 0xff, id2 0xff Probing for S29C31004T, 512 KB probe_jedec: id1 0xff, id2 0xff Probing for EON unknown SPI chip, 0 KB WARNING: size: 0 -> 4096 (page size) generic_spi_command called, but no SPI chipset detected Probing for MX unknown SPI chip, 0 KB WARNING: size: 0 -> 4096 (page size) generic_spi_command called, but no SPI chipset detected Probing for PMC unknown SPI chip, 0 KB WARNING: size: 0 -> 4096 (page size) generic_spi_command called, but no SPI chipset detected Probing for SST unknown SPI chip, 0 KB WARNING: size: 0 -> 4096 (page size) generic_spi_command called, but no SPI chipset detected Probing for ST unknown SPI chip, 0 KB WARNING: size: 0 -> 4096 (page size) generic_spi_command called, but no SPI chipset detected No EEPROM/flash device found. Sis530:~# After quick reading of your source code, I saw this probing function: int probe_jedec(struct flashchip *flash) { volatile uint8_t *bios = flash->virtual_memory; uint8_t id1, id2; uint32_t largeid1, largeid2; /* Issue JEDEC Product ID Entry command */ *(volatile uint8_t *)(bios + 0x5555) = 0xAA; myusec_delay(10); *(volatile uint8_t *)(bios + 0x2AAA) = 0x55; myusec_delay(10); *(volatile uint8_t *)(bios + 0x5555) = 0x90; /* Older chips may need up to 100 us to respond. The ATMEL 29C020 * needs 10 ms according to the data sheet, but it has been tested * to work reliably with 20 us. Allow a factor of 2 safety margin. */ myusec_delay(40); /* Read product ID */ id1 = *(volatile uint8_t *)bios; id2 = *(volatile uint8_t *)(bios + 0x01); largeid1 = id1; largeid2 = id2; /* Check if it is a continuation ID, this should be a while loop. */ if (id1 == 0x7F) { largeid1 <<= 8; id1 = *(volatile uint8_t *)(bios + 0x100); largeid1 |= id1; } if (id2 == 0x7F) { largeid2 <<= 8; id2 = *(volatile uint8_t *)(bios + 0x101); largeid2 |= id2; } /* Issue JEDEC Product ID Exit command */ *(volatile uint8_t *)(bios + 0x5555) = 0xAA; myusec_delay(10); *(volatile uint8_t *)(bios + 0x2AAA) = 0x55; myusec_delay(10); *(volatile uint8_t *)(bios + 0x5555) = 0xF0; myusec_delay(40); printf_debug("%s: id1 0x%x, id2 0x%x\n", __FUNCTION__, largeid1, largeid2); if (largeid1 == flash->manufacture_id && largeid2 == flash->model_id) return 1; return 0; } Seems flashrom routing got 0xff, 0xff on largeid1, largeid2. Has anybody tested this routing on SIS530? Thanks. Jun. -- FIXME if it is wrong.

2 2

r816 - cpu/x86/pc/olpc
by svn＠openbios.org 27 Feb '08

27 Feb '08

Author: wmb Date: 2008-02-27 05:40:24 +0100 (Wed, 27 Feb 2008) New Revision: 816 Added: cpu/x86/pc/olpc/parsekbd0.py Log: New file parsekbd0.py makes KA tags from old-style tables in Libya and Thailand keyboard wiki pages. Added: cpu/x86/pc/olpc/parsekbd0.py =================================================================== --- cpu/x86/pc/olpc/parsekbd0.py (rev 0) +++ cpu/x86/pc/olpc/parsekbd0.py 2008-02-27 04:40:24 UTC (rev 816) @@ -0,0 +1,262 @@ +#!/usr/bin/python +# parsekbd.py +# Usage: python parsekbd.py OLPC_Nigeria_Keyboard +# +# Gets the wiki page (e.g.) http://wiki.laptop.org/go/OLPC_Nigeria_Keyboard +# Parses the keyboard table contained therein and converts it to a KA +# tag per http://wiki.laptop.org/go/Manufacturing_Data#Keyboard_ASCII_Map. +# +# The output is stored in a file named (e.g.) OLPC_Nigeria_Keyboard.ka +# +# Warnings on standard output tell you if duplicate entries are discarded +# or if some ASCII characters are not present. +# +# In a few cases, this program substitutes dead_{grave,circumflex,tilde} +# for {grave,asciicircumflex,asciitilde} because the ascii versions are +# in inaccessible locations (the firmware has only shift, unshift, AltGr +# maps, so a Shift-AltGr symbol is inaccessible). + +from sys import * +from urllib import * +from HTMLParser import HTMLParser + +lastdata = "" +indent = 0 +tableseen = False +keys = 128*[0] +modifiers = 128*[0] +column = 0 +keyid = 0 + +# Convert from textual names of punctuation characters to the ASCII character +punctuation = { + 'exclam':ord('!'), + 'at':ord('@'), + 'numbersign':ord('#'), + 'dollar':ord('$'), + 'percent':ord('%'), + 'asciicircum':ord('^'), + 'dead_circumflex':ord('^'), + 'ampersand':ord('&'), + 'asterisk':ord('*'), + 'parenleft':ord('('), + 'parenright':ord(')'), + 'underscore':ord('_'), + 'plus':ord('+'), + 'minus':ord('-'), + 'equal':ord('='), + 'semicolon':ord(';'), + 'colon':ord(':'), + 'apostrophe':ord('\''), + 'grave':ord('`'), + 'dead_grave':ord('`'), + 'quotedbl':ord('"'), + 'dblquote':ord('"'), + 'bar':ord('|'), + 'less':ord('<'), + 'greater':ord('>'), + 'period':ord('.'), + 'slash':ord('/'), + 'backslash':ord('\\'), + 'question':ord('?'), + 'comma':ord(','), + 'bracketleft':ord('['), + 'bracketright':ord(']'), + 'braceleft':ord('{'), + 'braceright':ord('}'), + 'asciitilde':ord('~') , + 'dead_tilde':ord('~') , + 'backspace':8, + 'space':32, + 'tab':9, + 'linefeed':10, + 'enter':13, + 'esc':27, + 'escape':27, + 'del':127, + 'delete':127, + '&':ord('&'), + '<':ord('<'), + '>':ord('>'), +} + +def string_to_ascii(s): + if len(s) == 0: + return -1 + if len(s) == 1: + return ord(s) + try: + i = punctuation[s] + return i + except: + pass + if (len(s) == 3) & (s[:2] == 'C-'): + return ord(s[2]) & 0x1f + return -1 + +def handle_key(modifier, s): + global keyid + ascii = string_to_ascii(s) + if ascii == -1: + return + if keys[ascii] != 0: + if (ascii >= 0x20) & (((modifier & 1) == 0) & (keys[ascii] != keyid)): + if modifier < modifiers[ascii]: + print "Replacing", chr(ascii), "at keyid", keys[ascii], "modifier", modifiers[ascii], "with keyid", keyid, "modifier", modifier + else: + print "Discarding", chr(ascii), "at keyid", keyid, "modifier", modifier, "because keyid", keys[ascii], "modifier", modifiers[ascii], "is better" + return + if ascii < 0x20: + if (modifier & 2) != 0: # ctrl + if keys[ascii + 0x60] == keyid: + return + if keys[ascii + 0x40] == keyid: + return + keys[ascii] = keyid + modifiers[ascii] = modifier + +def do_key(): + global column, keyid, lastdata + s = lastdata.strip() + if column == 1: # row + pass + elif column == 2: # Key + if s.isdigit(): + keyid = int(s) + elif column == 3: # Unmodified + handle_key(0,s) + elif column == 4: # Shift + handle_key(1,s) + elif column == 5: # AltGR + handle_key(4,s) + elif column == 6: # Shift AltGr + # handle_key(5,s) + pass + elif column == 7: # Ctrl + handle_key(2,s) + elif column == 8: # Ctrl Shift + handle_key(6,s) + elif column == 9: # Fn + handle_key(8,s) + elif column == 10: # comment + pass + elif column == 11: # another comment + pass + +class MyHTMLParser(HTMLParser): + def handle_starttag(self, tag, attrs): + global column, keyid, indent, lastdata + #for i in range(indent): + # print "", + #print "<", tag + #indent = indent+2 + if tag == 'tr': + column = 0 + keyid = 0 + elif tag == 'td': + lastdata = "" + column = column + 1; + + def handle_endtag(self, tag): + global tableseen, column, keyid, indent + #for i in range(indent): + # print "", + #print tag,">" + #indent = indent - 2 + #if indent < 0: + # indent = 0 + + if tag == 'table': + tableseen = True + elif (tag == 'td') & tableseen: + do_key() + + def handle_data(self, data): + global lastdata, indent + #for i in range(indent): + # print "", + #print "{", data, "}" + lastdata = lastdata + data.strip() + if lastdata.startswith("There is currently no text"): + print "No such Wiki page" + raise + + def handle_entityref(self, data): + global lastdata, indent + #for i in range(indent): + # print "", + #print "{", data, "}" + # print "Entity", data.strip() + lastdata = lastdata + "&" + data.strip() + ";" + +# This table converts from the IBM physical keystation number to +# the corresponding scancode value in scan set 1. + +# 0 1 3 3 4 5 6 7 8 9 +scan1_map = [ + 0x00, 0x29, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, # 0x + 0x0a, 0x0b, 0x0c, 0x0d, 0x00, 0x0e, 0x0f, 0x10, 0x11, 0x12, # 1x + 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1a, 0x1b, 0x2b, # 2x + 0x3a, 0x1e, 0x1f, 0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, # 3x + 0x27, 0x28, 0x2b, 0x1c, 0x2a, 0x56, 0x2c, 0x2d, 0x2e, 0x2f, # 4x + 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x73, 0x36, 0x1d, 0x00, # 5x + 0x38, 0x39, 0x38, 0x00, 0x1d, 0x00, 0x00, 0x00, 0x00, 0x00, # 6x + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, # 7x + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, # 8x + 0x45, 0x47, 0x4B, 0x4F, 0x00, 0x00, 0x48, 0x4C, 0x50, 0x52, # 9x + 0x37, 0x49, 0x4D, 0x51, 0x53, 0x4A, 0x4E, 0x00, 0x1c, 0x00, # 10x + 0x01, 0x00, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f, 0x40, 0x41, 0x42, # 11x + 0x43, 0x44, 0x57, 0x58, 0x00, 0x46, 0x00, 0x00, 0x00, 0x00, # 12x + 0x79, 0x01, 0x00, 0x5c, 0x73, 0x6e, 0x00, 0x00, 0x00, 0x00, # 13x (analog intermediates) + 0x00, 0x00, 0x00, 0x00, 0x00, # 14x +] + +def put_ka_format(outfile): + global keys, modifiers + # a-z - output scancode only; unshifted map is implied + # and shifted map is derived automatically + for i in range(ord('a'),ord('a')+26): + if (keys[i] == 0): + print "Missing",chr(i) + if modifiers[i] != 0: + print chr(i),"is modified" + outfile.write(chr(scan1_map[keys[i]])) + + # Numbers and punctuation - output scancode and keymap number + for i in '0123456789!"#$%&\'()*+,-./:;<=>?@[\\]^_`{|}~': + ascii = ord(i) + if (keys[ascii] == 0): + print "Missing",i + if (modifiers[ascii] & 0xa) != 0: + print i,"is Ctrl or Fn" + outfile.write(chr(scan1_map[keys[ascii]])) + + if (modifiers[ascii] & 0x4) != 0: + # modifier & 4 implies AltGr map + outfile.write(chr(2)) + else: + # otherwise it's either the shift (1) or unshift (0) map + outfile.write(chr(modifiers[ascii] & 1)) + + outfile.write(chr(0)) # Null terminator + + outfile.write(chr(111 ^ 0xff)) + outfile.write(chr(111)) + outfile.write('KA') + +if len(argv) != 2: + print "Usage: python parsekbd.py PageName" +else: + try: + print "Getting",'http://wiki.laptop.org/go/' + argv[1] + infile = urlopen('http://wiki.laptop.org/go/' + argv[1]) + myparser=MyHTMLParser() + myparser.feed(infile.read()) + myparser.close() + infile.close() + outfile = open(argv[1] + '.ka', 'w') + put_ka_format(outfile) + outfile.close() + print "Output at",argv[1] + '.ka' + except: + print "Failed"

1 0

r815 - cpu/x86/pc/olpc
by svn＠openbios.org 07 Feb '08

07 Feb '08

Author: rsmith Date: 2008-02-07 05:52:01 +0100 (Thu, 07 Feb 2008) New Revision: 815 Modified: cpu/x86/pc/olpc/versions.fth Log: OLPC: q2d13. Update the EC pull so string such that it pulls a versions that says PQ2D13 Modified: cpu/x86/pc/olpc/versions.fth =================================================================== --- cpu/x86/pc/olpc/versions.fth 2008-02-06 23:10:03 UTC (rev 814) +++ cpu/x86/pc/olpc/versions.fth 2008-02-07 04:52:01 UTC (rev 815) @@ -5,7 +5,7 @@ macro: FW_MINOR 13 \ The EC microcode -macro: EC_VERSION d11 +macro: EC_VERSION d13 \ Alternate command for getting EC microcode, for testing new versions. \ Temporarily uncomment the line and modify the path as necessary

1 0

r814 - cpu/x86/pc/olpc
by svn＠openbios.org 06 Feb '08

06 Feb '08

Author: rsmith Date: 2008-02-07 00:10:03 +0100 (Thu, 07 Feb 2008) New Revision: 814 Modified: cpu/x86/pc/olpc/versions.fth Log: OLPC: q2d13 release. This is a cherry picked version of 791 + 803 + 812 + WLAN firmware 5.110.22.p1 Modified: cpu/x86/pc/olpc/versions.fth =================================================================== --- cpu/x86/pc/olpc/versions.fth 2008-02-05 07:48:34 UTC (rev 813) +++ cpu/x86/pc/olpc/versions.fth 2008-02-06 23:10:03 UTC (rev 814) @@ -2,7 +2,7 @@ \ The overall firmware revision macro: FW_MAJOR D -macro: FW_MINOR 12a +macro: FW_MINOR 13 \ The EC microcode macro: EC_VERSION d11 @@ -19,4 +19,4 @@ macro: WLAN_VERSION 5.110.22.p1 \ The bios_verify image -macro: CRYPTO_VERSION 0.3 +macro: CRYPTO_VERSION 0.2

1 0

r813 - cpu/x86/pc/olpc
by svn＠openbios.org 05 Feb '08

05 Feb '08

Author: wmb Date: 2008-02-05 08:48:34 +0100 (Tue, 05 Feb 2008) New Revision: 813 Modified: cpu/x86/pc/olpc/fw.bth cpu/x86/pc/olpc/security.fth Log: OLPC security - block exceptions during secure startup. Modified: cpu/x86/pc/olpc/fw.bth =================================================================== --- cpu/x86/pc/olpc/fw.bth 2008-02-05 06:43:24 UTC (rev 812) +++ cpu/x86/pc/olpc/fw.bth 2008-02-05 07:48:34 UTC (rev 813) @@ -261,10 +261,10 @@ false ; -: protect-fw ( -- ) - " wp" find-tag if 2drop ec-indexed-io-off then -; +false value secure? +: protect-fw ( -- ) secure? if ec-indexed-io-off then ; + \ stand-init-debug? [if] warning @ warning off : init @@ -350,7 +350,6 @@ ' gx-power-off to power-off [then] - : dimmer ( -- ) screen-ih if " dimmer" screen-ih $call-method then ; : brighter ( -- ) screen-ih if " brighter" screen-ih $call-method then ; @@ -558,6 +557,7 @@ : startup ( -- ) standalone? 0= if exit then + block-exceptions no-page ?factory-mode @@ -585,6 +585,7 @@ ?diags ?fs-update secure-startup + unblock-exceptions ['] (interrupt-auto-boot?) to interrupt-auto-boot? text-on banner Modified: cpu/x86/pc/olpc/security.fth =================================================================== --- cpu/x86/pc/olpc/security.fth 2008-02-05 06:43:24 UTC (rev 812) +++ cpu/x86/pc/olpc/security.fth 2008-02-05 07:48:34 UTC (rev 813) @@ -564,13 +564,29 @@ r> to load-path ; -false value secure? false value in-factory? stand-init: wp " wp" find-tag if 2drop true to secure? then ; +: message-and-off ( -- ) + aborted? @ if + aborted? off + ." Keyboard interrupt" cr + else + (.exception) + then + ." Powering off ..." + d# 5000 ms + power-off +; + +: block-exceptions ( -- ) + secure? if ['] message-and-off to .exception then +; +: unblock-exceptions ( -- ) ['] .entry to .exception ; + \ check-devel-key tests the developer signature string "dev01$". \ -1 means the signature is for this machine and is invalid

1 0

r812 - dev/olpc/keyboard
by svn＠openbios.org 05 Feb '08

05 Feb '08

Author: wmb Date: 2008-02-05 07:43:24 +0100 (Tue, 05 Feb 2008) New Revision: 812 Modified: dev/olpc/keyboard/selftest.fth Log: OLPC trac 6339 - stack bug crashes selftest under some circumstances. Modified: dev/olpc/keyboard/selftest.fth =================================================================== --- dev/olpc/keyboard/selftest.fth 2008-02-04 09:39:55 UTC (rev 811) +++ dev/olpc/keyboard/selftest.fth 2008-02-05 06:43:24 UTC (rev 812) @@ -381,9 +381,9 @@ : process-raw ( scan-code -- exit? ) verbose? if dup u. then - dup h# e0 = if - true to esc? - else + dup h# e0 = if ( scan ) + drop true to esc? ( ) + else ( scan ) dup h# 7f and scan1->key# if ( scan ) drop ( ) else ( scan key# ) @@ -393,9 +393,9 @@ else ( key# ) key-down ( ) then ( ) - then - false to esc? - then + then ( ) + false to esc? ( ) + then ( ) false ;

1 0

r811 - dev/mmc/sdhci
by svn＠openbios.org 04 Feb '08

04 Feb '08

Author: wmb Date: 2008-02-04 10:39:55 +0100 (Mon, 04 Feb 2008) New Revision: 811 Modified: dev/mmc/sdhci/sdhci.fth Log: OLPC trac 6230 - Added count of simultaneous opens to sdhci.fth so that multiple files can be open without losing the host controller when one file is closed. Modified: dev/mmc/sdhci/sdhci.fth =================================================================== --- dev/mmc/sdhci/sdhci.fth 2008-02-02 20:52:14 UTC (rev 810) +++ dev/mmc/sdhci/sdhci.fth 2008-02-04 09:39:55 UTC (rev 811) @@ -587,17 +587,24 @@ dma-len /block / ; +0 value open-count : open ( -- ) - map-regs - setup-host + open-count 0= if + map-regs + setup-host + then + open-count 1+ to open-count true ; : close ( -- ) - wait-write-done - card-clock-off - card-power-off - unmap-regs + open-count 1 = if + wait-write-done + card-clock-off + card-power-off + unmap-regs + then + open-count 1- 0 max to open-count ; : init ( -- )

1 0

Openfirmware build failure
by Paul McEnery 03 Feb '08

03 Feb '08

I have just checked out r810 from subversion following these instructions: http://www.openbios.org/Open_Firmware On performing a `make' for openbios, I get the following issue: ================================================================== paulm@desktop:~/openfirmware/cpu/x86/pc/biosload/build$ make make[1]: Entering directory `/home/paulm/tmp/qemu/openfirmware/cpu/x86/Linux' cc -c -O -g -m32 -DTARGET_X86 ../../../forth/wrapper/wrapper.c -o wrapper.o cc -c -O -g -m32 -DTARGET_X86 ../../../forth/wrapper/logger.c -o logger.o cc -c -O -g -m32 -DTARGET_X86 -I../../../forth/wrapper/zip ../../../forth/wrapper/zip/zipmem.c -o zipmem.o cc -c -O -g -m32 -DTARGET_X86 -I../../../forth/wrapper/zip ../../../forth/wrapper/zip/deflate.c -o deflate.o cc -c -O -g -m32 -DTARGET_X86 -I../../../forth/wrapper/zip ../../../forth/wrapper/zip/trees.c -o trees.o cc -c -O -g -m32 -DTARGET_X86 -I../../../forth/wrapper/zip ../../../forth/wrapper/zip/bits.c -o bits.o cc -c -O -g -m32 -DTARGET_X86 -I../../../forth/wrapper/zip ../../../forth/wrapper/zip/util.c -o util.o cc -c -m32 -O0 -fpic ../../../forth/wrapper/zip/inflate.c -o inflate.o cc -m32 -o forth wrapper.o logger.o zipmem.o deflate.o trees.o bits.o util.o inflate.o make[1]: Leaving directory `/home/paulm/tmp/qemu/openfirmware/cpu/x86/Linux' make[1]: Entering directory `/home/paulm/tmp/qemu/openfirmware/cpu/x86/build' make -C ../Linux ../build/inflate.bin make[2]: Entering directory `/home/paulm/tmp/qemu/openfirmware/cpu/x86/Linux' objcopy -O binary inflate.o ../build/inflate.bin make[2]: Leaving directory `/home/paulm/tmp/qemu/openfirmware/cpu/x86/Linux' make[1]: Leaving directory `/home/paulm/tmp/qemu/openfirmware/cpu/x86/build' ./build ofw.c32 --- Rebuilding reset.di --- Cmd: ${HOSTDIR}/forth ${HOSTDIR}/../build/builder.dic ../reset.bth --- Rebuilding start.di --- Cmd: ${HOSTDIR}/forth ${HOSTDIR}/../build/builder.dic ../start.bth --- Rebuilding kernel.dic --- Cmd: ${HOSTDIR}/forth ${HOSTDIR}/../build/builder.dic ../kernel.bth --- Saving kernel.dic --- --- Rebuilding tools.dic --- Cmd: ${HOSTDIR}/x86forth ${BP}/cpu/x86/build/kernel.dic ../tools.bth --- Saving tools.dic --- --- Rebuilding basefw.dic --- Cmd: ${HOSTDIR}/x86forth ${BP}/cpu/x86/build/tools.dic ../basefw.bth --- Saving basefw.dic --- --- Rebuilding bootsec.hex --- Cmd: ${HOSTDIR}/forth ${HOSTDIR}/../build/builder.dic ../bootsec.bth 1fe 1f0 400 400 --- Rebuilding fw.img --- Cmd: ${HOSTDIR}/x86forth ${BP}/cpu/x86/build/basefw.dic ../fw.bth ${BP}/cpu/x86/pc/biosload/rmenter.fth:209: pm-cs ? make: *** [ofw.c32] Error 1 ================================================================== I am building on Ubuntu 7.10. If someone could point me in the right direction, it would be much appreciated. TIA

1 0

r810 - cpu/x86/pc/olpc
by svn＠openbios.org 02 Feb '08

02 Feb '08

Author: wmb Date: 2008-02-02 21:52:14 +0100 (Sat, 02 Feb 2008) New Revision: 810 Modified: cpu/x86/pc/olpc/versions.fth Log: OLPC versions.fth - last revision was for a cherry-picked release that uses specific older versions of bios-crypto and WLAN firmware. This revision restores the new versions of same. Modified: cpu/x86/pc/olpc/versions.fth =================================================================== --- cpu/x86/pc/olpc/versions.fth 2008-02-02 20:48:25 UTC (rev 809) +++ cpu/x86/pc/olpc/versions.fth 2008-02-02 20:52:14 UTC (rev 810) @@ -2,7 +2,7 @@ \ The overall firmware revision macro: FW_MAJOR D -macro: FW_MINOR 12 +macro: FW_MINOR 12a \ The EC microcode macro: EC_VERSION d11 @@ -16,7 +16,7 @@ \ The wireless LAN module firmware macro: WLAN_RPM ${WLAN_VERSION}-1.olpc1 -macro: WLAN_VERSION 5.110.20.p49 +macro: WLAN_VERSION 5.110.22.p1 \ The bios_verify image -macro: CRYPTO_VERSION 0.2 +macro: CRYPTO_VERSION 0.3

1 0

r809 - cpu/x86/pc/olpc
by svn＠openbios.org 02 Feb '08

02 Feb '08

Author: wmb Date: 2008-02-02 21:48:25 +0100 (Sat, 02 Feb 2008) New Revision: 809 Modified: cpu/x86/pc/olpc/versions.fth Log: Q2D12 - SVN 791 + cherry-picked 803 to fix JFFS2 problem (trac 6291) Same as Q2D11 except for the JFFS2 fix. Modified: cpu/x86/pc/olpc/versions.fth =================================================================== --- cpu/x86/pc/olpc/versions.fth 2008-02-01 08:03:12 UTC (rev 808) +++ cpu/x86/pc/olpc/versions.fth 2008-02-02 20:48:25 UTC (rev 809) @@ -2,10 +2,10 @@ \ The overall firmware revision macro: FW_MAJOR D -macro: FW_MINOR 09 +macro: FW_MINOR 12 \ The EC microcode -macro: EC_VERSION d08b +macro: EC_VERSION d11 \ Alternate command for getting EC microcode, for testing new versions. \ Temporarily uncomment the line and modify the path as necessary @@ -16,7 +16,7 @@ \ The wireless LAN module firmware macro: WLAN_RPM ${WLAN_VERSION}-1.olpc1 -macro: WLAN_VERSION 5.110.22.p1 +macro: WLAN_VERSION 5.110.20.p49 \ The bios_verify image -macro: CRYPTO_VERSION 0.3 +macro: CRYPTO_VERSION 0.2

1 0