January 2011 - openfirmware - mail.coreboot.org

[commit] r2139 - cpu/arm/olpc/1.75
by repository service Jan. 21, 2011

Jan. 21, 2011

Author: wmb Date: Fri Jan 21 21:47:20 2011 New Revision: 2139 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2139 Log: OLPC XO-1.75 - fixed a build problem introduced by the elimination of md5sum from builder scripts. Modified: cpu/arm/olpc/1.75/sd8686.bth cpu/arm/olpc/1.75/verify.bth Modified: cpu/arm/olpc/1.75/sd8686.bth ============================================================================== --- cpu/arm/olpc/1.75/sd8686.bth Fri Jan 21 21:46:15 2011 (r2138) +++ cpu/arm/olpc/1.75/sd8686.bth Fri Jan 21 21:47:20 2011 (r2139) @@ -21,7 +21,7 @@ to-file md5string " " " ${WLAN_FILE}.bin" expand$ $md5sum-file " cmp md5string ${WLAN_FILE}.bin.md5" expand$ $sh -" mv ${WLAN_FILE}.bin sd8686.bin" expand$ $sh +" cp ${WLAN_FILE}.bin sd8686.bin" expand$ $sh " wget -q http://dev.laptop.org/pub/firmware/libertas/sd8686_helper.bin" expand$ $sh " wget -q http://dev.laptop.org/pub/firmware/libertas/sd8686_helper.bin.md5" expand$ $sh Modified: cpu/arm/olpc/1.75/verify.bth ============================================================================== --- cpu/arm/olpc/1.75/verify.bth Fri Jan 21 21:46:15 2011 (r2138) +++ cpu/arm/olpc/1.75/verify.bth Fri Jan 21 21:47:20 2011 (r2139) @@ -19,7 +19,7 @@ to-file md5string " *" " bios_verify-${CRYPTO_VERSION}.img" expand$ $md5sum-file " cmp md5string bios_verify-${CRYPTO_VERSION}.img.md5" expand$ $sh -" mv bios_verify-${CRYPTO_VERSION}.img verify.img" expand$ $sh +" cp bios_verify-${CRYPTO_VERSION}.img verify.img" expand$ $sh " rm bios_verify-${CRYPTO_VERSION}.img.md5 md5string" expand$ $sh \ This forces the creation of an verify.log file, so we don't re-fetch

1 0

[commit] r2138 - cpu/arm/olpc/1.75
by repository service Jan. 21, 2011

Jan. 21, 2011

Author: wmb Date: Fri Jan 21 21:46:15 2011 New Revision: 2138 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2138 Log: OLPC XO-1.75 - added barely-tested support for EC reflashing via EDI interconnect. Added: cpu/arm/olpc/1.75/bbedi.fth cpu/arm/olpc/1.75/edi.fth Modified: cpu/arm/olpc/1.75/devices.fth Added: cpu/arm/olpc/1.75/bbedi.fth ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ cpu/arm/olpc/1.75/bbedi.fth Fri Jan 21 21:46:15 2011 (r2138) @@ -0,0 +1,217 @@ +\ See license at end of file +purpose: Bit-banged SPI bus driver for KB3731 EC "EDI" interface + +d# 103 constant edi-miso-gpio# +d# 104 constant edi-cs-gpio# +d# 105 constant edi-mosi-gpio# +d# 106 constant edi-clk-gpio# + +: edi-cs-on ( -- ) edi-cs-gpio# gpio-clr ; +: edi-cs-off ( -- ) edi-cs-gpio# gpio-set ; + +: edi-clk-lo ( -- ) edi-clk-gpio# gpio-clr ; +: edi-clk-hi ( -- ) edi-clk-gpio# gpio-set ; + +0 [if] +\ All this timing stuff is pointless because the GPIOs are so slow +\ that the problem is to make the clock go fast enough to satisfy +\ the initial connection speed requirement. + +\ We need to run at between 1 and 2 MHz for the initial connection, +\ and then we can go faster, up to 16 Mhz. +\ The half-cycle period for 1-2 MHz is between 250 ns and 500 ns. +\ Timer0 runs at 6.5 MHz so each tick is about 150 ns. +\ Two ticks is 300 ns, three is 450 ns. +code spins ( count -- ) + cmp tos,#0 + <> if + begin + subs tos,tos,#1 + 0= until + then + pop tos,sp +c; + +d# 150 value edi-dly-spins +: edi-dly ( -- ) edi-dly-spins spins ; + +\ CPU clock is 800 Mhz, so 1.25 ns/clock +\ spins is 2 clocks/spin, so 2.5 ns/spin +\ Slow clock must be between 1 and 2 MHz, so period is between 1000 and 500 ns. +\ edi-dly is a half cycle, so edi-dly for slow clock is between 500 and 250 ns. +\ So we need between 200 and 100 spins for slow edi-dly +\ Fast clock can be up to 16 Mhz, so full-cycle period of 62.5 ns, half-cycle +\ period of >= 31.25 ns, so >= 12.5 spins at 2.5. ns/spin. + +: slow-edi-clock ( -- ) d# 150 to edi-dly-spins ; +: fast-edi-clock ( -- ) d# 13 to edi-dly-spins ; + +code edi-bit! ( flag -- ) + mov r0,#0x200 + set r1,#0xd4019100 + cmp tos,#0 + streq r0,[r1,#0x24] \ Clr MOSI if flag is 0 + strne r0,[r1,#0x18] \ Set MOSI if flag is non0 + mov r0,#0x400 + str r0,[r1,#0x18] \ Set CLK + str r0,[r1,#0x24] \ Clr CLK + pop tos,sp +c; + +[ifndef] edi-bit! +: edi-bit! ( flag -- ) + edi-mosi-gpio# swap if gpio-set else gpio-clr then + edi-clk-hi + edi-dly + edi-clk-lo + edi-dly +; +[then] + +[ifndef] edi-bit! +: edi-bit! ( flag -- ) + if + [ edi-mosi-gpio# >gpio-pin h# 18 + ] dliteral l! \ Fast gpio-set + else + [ edi-mosi-gpio# >gpio-pin h# 24 + ] dliteral l! \ Fast gpio-clr + then + [ edi-clk-gpio# >gpio-pin h# 18 + ] dliteral l! \ Fast gpio-set +\ edi-dly + [ edi-clk-gpio# >gpio-pin h# 24 + ] dliteral l! \ Fast gpio-set +\ edi-dly +; +[then] + +: edi-out ( b -- ) + 8 0 do ( b ) + dup h# 80 and edi-bit! ( b ) + 2* ( b' ) + loop ( b ) + drop ( ) +; +: edi-bit@ ( -- flag ) + edi-clk-hi + edi-dly + edi-miso-gpio# gpio-pin@ + edi-clk-lo + edi-dly +; +: edi-in-h ( b -- ) + 0 ( b ) + 8 0 do ( b ) + 2* edi-bit@ 1 and or ( b' ) + loop ( b ) +; +[else] +code edi-out0 ( byte -- ) + mov r2,#8 + mov r0,#0x200 \ MOSI mask + set r1,#0xd4019100 \ GPIO register address + mov r4,#0x400 \ CLK mask + begin + ands r3,tos,#0x80 \ Test bit + + strne r0,[r1,#0x18] \ Set MOSI if bit is non0 + streq r0,[r1,#0x24] \ Clr MOSI if bit is 0 + + str r4,[r1,#0x18] \ Set CLK + str r4,[r1,#0x24] \ Clr CLK + + add tos,tos,tos \ Left shift TOS + decs r2,1 + 0= until + + pop tos,sp +c; +code edi-out ( byte -- ) + mov r2,#8 + mov r0,#0x200 \ MOSI mask + set r1,#0xd4019100 \ GPIO register address + mov r4,#0x400 \ CLK mask + mov r5,#0x600 \ CLK and MOSI mask + begin + ands r3,tos,#0x80 \ Test bit + + strne r5,[r1,#0x18] \ Set MOSI and CLK in the same operation if bit is non0 + streq r0,[r1,#0x24] \ Clr MOSI + streq r4,[r1,#0x18] \ Set CLK + + str r4,[r1,#0x24] \ Clr CLK + + add tos,tos,tos \ Left shift TOS + decs r2,1 + 0= until + + pop tos,sp +c; +code edi-in ( -- byte ) + psh tos,sp + mov tos,#0 \ Initial byte value + mov r2,#8 + mov r3,#0x100 + set r1,#0xd4019100 \ GPIO register address + mov r4,#0x400 \ CLK mask + begin + add tos,tos,tos \ Left shift byte + + str r4,[r1,#0x18] \ Set CLK + + \ This delay is necessary to let the MMP2 GPIO pin clock in the + \ data value. Without the delay, bit values get lost. + mov r7,#0x160 \ Delay spins + begin + decs r7,#1 + 0= until + + ldr r0,[r1] \ Read pin register + str r0,[r3],#4 + str r4,[r1,#0x24] \ Clr CLK + ands r0,r0,#0x80 \ Test MISO bit + incne tos,1 \ Set bit in byte + + decs r2,1 + 0= until +c; + +[then] + + +: edi-spi-start ( -- ) + ['] edi-in to spi-in + ['] edi-out to spi-out + ['] edi-cs-on to spi-cs-on + ['] edi-cs-off to spi-cs-off + d# 16 to spi-us + ['] noop to spi-reprogrammed + +\ use-edi-flash-read \ Defined later + + edi-clk-lo edi-cs-off +; + +: use-edi-spi ( -- ) ['] edi-spi-start to spi-start ; + + +\ LICENSE_BEGIN +\ Copyright (c) 2011 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 Modified: cpu/arm/olpc/1.75/devices.fth ============================================================================== --- cpu/arm/olpc/1.75/devices.fth Fri Jan 21 21:43:11 2011 (r2137) +++ cpu/arm/olpc/1.75/devices.fth Fri Jan 21 21:46:15 2011 (r2138) @@ -308,6 +308,9 @@ fload ${BP}/cpu/arm/olpc/1.75/accelerometer.fth fload ${BP}/cpu/arm/olpc/1.75/compass.fth +fload ${BP}/cpu/arm/olpc/1.75/bbedi.fth +fload ${BP}/cpu/arm/olpc/1.75/edi.fth + warning @ warning off : stand-init stand-init Added: cpu/arm/olpc/1.75/edi.fth ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ cpu/arm/olpc/1.75/edi.fth Fri Jan 21 21:46:15 2011 (r2138) @@ -0,0 +1,266 @@ +\ See license at end of file +purpose: Access and FLASH programming for KB3731 EC via its "EDI" interface + +\ The following code depends on externally-privided low-level SPI bus +\ access primitives that are defined in "bbedi.fth" for the "native" +\ case (EC and CPU on the same machine). They can also be implemented +\ for tethered programming from a different machine like an XO-1.5. +\ +\ Low-level primitives: +\ spi-start ( -- ) - Init SPI bus +\ spi-cs-on ( -- ) - Assert SPI-bus CS# +\ spi-cs-off ( -- ) - Deassert SPI-bus CS# +\ spi-out ( byte -- ) - Send byte +\ spi-in ( -- byte ) - Receive byte + +h# 128 constant /flash-page + +: edi-cmd,adr ( offset cmd -- ) \ Send command plus 3 address bytes + spi-cs-on ( offset cmd ) + spi-out ( offset ) + lbsplit drop spi-out spi-out spi-out ( ) +; +: edi-b! ( byte offset -- ) \ Write byte to address inside EC chip + h# 40 edi-cmd,adr spi-out spi-cs-off +; +[ifndef] edi-wait-b +: edi-wait-b ( -- b ) \ Wait for and receive EC response byte + d# 10 0 do + spi-in h# 50 = if + spi-in ( b ) + spi-cs-off ( b ) + unloop exit + then + loop + true abort" EDI byte in timeout" +; +[then] +: edi-b@ ( offset -- b ) \ Read byte from address inside EC chip + h# 30 edi-cmd,adr edi-wait-b +; +: edi-next-b@ ( -- b ) \ Read the next EC byte - auto-increment address + spi-cs-on h# 33 spi-out edi-wait-b +; +: edi-disable ( -- ) \ Turn off the EC EDI interface + spi-cs-on + h# f3 spi-out + spi-in ( b ) + spi-cs-off + h# 8c <> if + ." Unexpected response from edi-disable" cr + then +; + +0 [if] +: edi-w@ ( offset -- w ) \ Read 16-bit word from address inside EC chip + dup 1+ edi-b@ ( offset b.low ) + swap edi-b@ ( b.low b.high ) + bwjoin +; +[else] +: edi-w@ ( offset -- w ) \ Read 16-bit word from address inside EC chip + edi-b@ edi-next-b@ swap bwjoin +; +[then] +: reset-8051 ( -- ) \ Reset 8-5 + h# f010 edi-b@ 1 or h# f010 edi-b! +; +: unreset-8051 ( -- ) \ Reset 8-5 + h# f010 edi-b@ 1 invert and h# f010 edi-b! +; + +\ 0 in bit 0 selects masked ROM as code source for 8051, 1 selects FLASH +\ The 8051 should be in reset mode when changing that bit. +: select-flash ( -- ) \ Setup for access to FLASH inside the EC + h# f011 edi-b@ 1 or h# f011 edi-b! +; + +: probe-rdid ( -- found? ) \ Verify that the EC is the one we think it is + select-flash + h# f01c ['] edi-w@ catch if ( x ) + drop false exit ( -- false ) + then ( id ) + + 1 invert and h# 3730 = +; + +: wait-flash-busy ( -- ) \ Wait for an erase/programming operation to complete + get-msecs h# 1000 + ( limit ) + begin ( limit ) + h# fea0 edi-b@ ( limit b ) + h# 80 and if ( limit ) + drop exit + then ( limit ) + dup get-msecs - 0<= ( limit timeout? ) + until ( limit ) + drop + true abort" EDI FLASH busy timeout" +; + +: flash-cmd ( b -- ) h# fea7 edi-b! ; + +: set-offset ( offset -- ) + wbsplit ( offset-low offset-hi ) + h# fea9 edi-b! h# fea8 edi-b! ( ) +; + +: erase-page ( offset -- ) + wait-flash-busy ( offset ) + set-offset ( ) + h# 20 flash-cmd ( ) +; + +: erase-chip ( -- ) wait-flash-busy h# 60 flash-cmd wait-flash-busy ; + +: send-byte ( b offset -- ) set-offset h# feaa edi-b! 2 flash-cmd ; + +: program-page ( adr offset -- ) + \ Clear HVPL + wait-flash-busy h# 80 flash-cmd ( adr offset ) + + \ Fill the page buffer + swap /flash-page bounds do ( offset ) + i c@ over send-byte ( offset ) + 1+ ( offset' ) + loop ( offset ) + drop ( ) + + \ Commit the buffer to the FLASH memory + wait-flash-busy ( ) \ Redundant wait? + h# 70 flash-cmd ( ) + wait-flash-busy ( ) +; +: edi-read-flash ( adr len offset -- ) + over 0= if 3drop exit then ( adr len offset ) + edi-b@ ( adr len byte ) + third c! ( adr len ) + 1 /string bounds ?do ( ) + edi-next-b@ i c! ( ) + loop ( ) +; +: edi-open ( -- ) + \ slow-edi-clock \ Target speed between 1 and 2 MHz + spi-start + reset-8051 + \ fast-edi-clock \ Target speed up to 16 MHz + \ reset +; +0 [if] ++// IO3731 internal register locations ++#define E51_RST 0xf010 // 8051 Reset Control ++#define CODE_SEL 0xf011 // Code Source selection ++#define CHIP_ID_H 0xf01c // Chip ID High Byte ++#define CHIP_ID_L 0xf01d // Chip ID Low Byte ++#define IOSCCR 0xf02b // Internal OSC Control ++#define LVD_TRIM 0xf035 // Low Voltage Detect Trim ++#define XBIEFCFG 0xfea0 // XBI Embedded Flash Configuration ++#define XBIEFSIG1 0xfea1 // XBI Embedded Flash signals 1 in FW mode ++#define XBIEFSIG2 0xfea2 // XBI Embedded Flash signals 2 in FW mode ++#define XBIPUMP 0xfea3 // XBI Pump IP trimming bits ++#define XBIFM 0xfea4 // XBI Flash IP trimming bits ++#define XBIVR 0xfea5 // XBI VR IP trimming bits ++#define XBIMISC 0xfea6 // XBI MISC Reg ++#define XBIEFCMD 0xfea7 // XBI Embedded Flash Command Port ++#define XBIEFA0 0xfea8 // XBI Embedded Flash Address high ++#define XBIEFA1 0xfea9 // XBI Embedded Flash Address low ++#define XBIEFDO 0xfeaa // XBI Embedded Flash Output Data Port ++#define XBIEFDI 0xfeab // XBI Embedded Flash Input Data Port ++ ++ ++// IO3731 embedded flash command support: ++#define PAGE_LATCH 0x02 // Page latch ++#define READ 0x03 // Read ++#define ERASEPAGE 0x20 // Erase selected page ++#define ERASECHIP 0x60 // Erase whole e-flash ++#define PROGRAMPAGE 0x70 // Program selected page ++#define CLEARPAGELATCH 0x80 // Clear HVPL data ++#define READTRIMDATA 0x90 // Read Trim data from special rows +[then] +: trim@ ( offset -- b ) + set-offset + h# 90 flash-cmd + wait-flash-busy + h# feab edi-b@ +; +: trim-tune ( -- ) +\ firmware-id 0= if + \ Read trim data and write to register (for ENE macros) + h# 100 trim@ h# 5a = if + \ Low Voltage Detect TRIM register + h# f035 edi-b@ ( val ) + h# 1f invert and ( val' ) + h# 101 trim@ h# 1f and or ( val' ) + h# f035 edi-b! ( ) + + \ Int Oscillator Control register - HKCOMOS32K + h# f02b edi-b@ ( val ) + h# 0f invert and ( val' ) + h# 102 trim@ h# 0f and or ( val' ) + h# f02b edi-b! ( ) + then + + \ Read trim data and write to register (for HHNEC macros) + h# 1ff trim@ 0<> if + \ XBIMISC register - S[4:0] + h# fea6 edi-b@ ( val ) + h# 1f invert and ( val' ) + h# 1f0 trim@ h# 1f and or ( val' ) + h# fea6 edi-b! ( ) + + \ XBI Pump IP register - Pdac[3:0] | Ndac[3:0] + h# 1f1 trim@ 4 lshift ( val ) + h# 1f2 trim@ h# 0f and or ( val' ) + h# fea3 edi-b! ( ) + + \ XBI Flash IP register - Bdac[3:0] + h# fea4 edi-b@ ( val ) + h# 0f invert and ( val' ) + h# 1f4 trim@ h# 0f and or ( val' ) + h# fea4 edi-b! ( ) + + \ XB VR IP register - Tctrim[3:0] | Abstrim[3:0] (Vref temp coef and absolute value) + h# 1f5 trim@ 4 lshift ( val ) + h# 1f6 trim@ h# 0f and or ( val' ) + h# fea5 edi-b! ( ) + + \ XBI Flash IP register - Itim[3:0] - Must be last + h# fea4 edi-b@ ( val ) + h# f0 invert and ( val' ) + h# 1f4 trim@ 4 lshift or ( val' ) + h# fea4 edi-b! ( ) + + 3 us \ Required after Itim[3:0] update + + \ XBI Embedded Flash Configuration register + h# 10 h# fea0 edi-b! \ Set FLASH clock + + h# fea0 edi-b@ h# d0 = if + ." Warning - XBIECFG is 0xd0" cr + then + then +\ then +; + +\ LICENSE_BEGIN +\ Copyright (c) 2011 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

1 0

[commit] r2137 - forth/kernel
by repository service Jan. 21, 2011

Jan. 21, 2011

Author: wmb Date: Fri Jan 21 21:43:11 2011 New Revision: 2137 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2137 Log: Kernel - fixme: now reports extra information. Modified: forth/kernel/kernel.fth Modified: forth/kernel/kernel.fth ============================================================================== --- forth/kernel/kernel.fth Fri Jan 21 01:36:19 2011 (r2136) +++ forth/kernel/kernel.fth Fri Jan 21 21:43:11 2011 (r2137) @@ -3082,7 +3082,7 @@ : command: [compile] \ ; : in: [compile] \ ; : dictionary: [compile] \ ; -: fixme: ." FIXME: " -1 parse type cr ; +: fixme: ." FIXME: " opened-filename 2@ type ." : " -1 parse type cr ; \ From cmdline.fth

1 0

[commit] r2136 - dev/usb2/hcd/ehci
by repository service Jan. 20, 2011

Jan. 20, 2011

Author: quozl Date: Fri Jan 21 01:36:19 2011 New Revision: 2136 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2136 Log: OLPC XO-1.5 - undo part of -r2120 because it broke build Modified: dev/usb2/hcd/ehci/intr.fth Modified: dev/usb2/hcd/ehci/intr.fth ============================================================================== --- dev/usb2/hcd/ehci/intr.fth Fri Jan 21 01:12:35 2011 (r2135) +++ dev/usb2/hcd/ehci/intr.fth Fri Jan 21 01:36:19 2011 (r2136) @@ -118,10 +118,8 @@ headers -warning @ warning off : (end-extra) ( -- ) (end-extra) end-intr-in ; ' (end-extra) to end-extra -warning ! \ LICENSE_BEGIN

1 0

[commit] r2135 - cpu/arm
by repository service Jan. 20, 2011

Jan. 20, 2011

Author: wmb Date: Fri Jan 21 01:12:35 2011 New Revision: 2135 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2135 Log: ARM - support movw in assembler, disassembler and simulator, support msr in simulator. Modified: cpu/arm/armsim.c cpu/arm/assem.fth cpu/arm/disassem.fth Modified: cpu/arm/armsim.c ============================================================================== --- cpu/arm/armsim.c Fri Jan 21 01:10:53 2011 (r2134) +++ cpu/arm/armsim.c Fri Jan 21 01:12:35 2011 (r2135) @@ -496,7 +496,7 @@ default: UNIMP("BXTYPE"); break; } break; case 0x09: switch (BXTYPE) { - case 0x0: UNIMP("msr"); break; + case 0x0: INSTR("msr"); APSR.all = RM; break; case 0x1: INSTR("bx"); PC = RM; break; case 0x2: INSTR("bxj"); PC = RM; break; case 0x3: INSTR("blx"); if (LINK) LR = PC - 4; PC = RM; break; @@ -805,7 +805,7 @@ case 0x15: INSTR("adc"); ADC(RD, RN, IMM32, C); break; case 0x16: INSTR("sbc"); SBB(RD, IMM32, RN, C); break; case 0x17: INSTR("rsc"); SBB(RD, IMM32, RN, C); break; -case 0x18: INSTR("mov"); RD = IMM16; break; +case 0x18: INSTR("movw"); RD = IMM16; break; case 0x19: switch (BXTYPE) { case 0x0: INSTR("nop"); break; case 0x1: Modified: cpu/arm/assem.fth ============================================================================== --- cpu/arm/assem.fth Fri Jan 21 01:10:53 2011 (r2134) +++ cpu/arm/assem.fth Fri Jan 21 01:12:35 2011 (r2135) @@ -548,6 +548,18 @@ : amode-rdop2 ( -- ) init-operands get-r12 get-opr2 !op ; : amode-rev ( -- ) init-operands get-r12 get-r00 !op ; +: set-imm16 ( n -- ) + dup fff and 0 set-field + d# 12 >> d# 16 set-field +; +: amode-movw ( -- ) + init-operands get-r12 get-immediate ( imm ) + dup 0 10000 within 0= if + " Immediate value won't fit in 16 bits" ad-error + then + set-imm16 !op +; + : amode-lsm ( need-r16? -- ) init-operands if @@ -923,6 +935,7 @@ : clz 016f.0f10 {cond/s} amode-rdop2 ; : mov 01a0.0000 {cond/s} amode-rdop2 ; : mvn 01e0.0000 {cond/s} amode-rdop2 ; +: movw 0300.0000 {cond} amode-movw ; : mul 0000.0090 {cond/s} amode-mul ; : mla 0020.0090 {cond/s} amode-mla ; @@ -988,7 +1001,7 @@ get-register >r ( r: adr? reg# ) get-immediate r> r> rot ( reg# adr? addr|imm ) 2dup swap if ( reg# adr? addr|imm addr|imm ) - here >offset ( reg# adr? addr|imm offset|imm ) + here >offset ( reg# adr? addr|imm offset ) then dup fits? if ( reg# adr? addr|imm offset|imm ) 2drop if @@ -1004,7 +1017,11 @@ true asm-const ( reg# op ) then else ( reg# imm imm ) - drop false asm-const ( reg# op ) + 0 1.0000 within if ( reg# imm ) + set-imm16 0300.0000 ( reg# op ) \ movw rN,#<imm16> + else ( reg# imm ) + false asm-const ( reg# op ) + then then ( reg# op ) then ( reg# op ) iop rd-field !op Modified: cpu/arm/disassem.fth ============================================================================== --- cpu/arm/disassem.fth Fri Jan 21 01:10:53 2011 (r2134) +++ cpu/arm/disassem.fth Fri Jan 21 01:12:35 2011 (r2135) @@ -245,10 +245,16 @@ d#24 bit? 0= 5 2 bits 0= and if .alu-ext else .ld/st-ext then ; +: .movw ( -- ) \ movw rN,#imm + ." movw" {<cond>} op.rd, ." #" + d# 16 4bits d# 12 << 0 d# 12 bits or u.h +; + \ Stop after changing PC : ?pc-change ( -- ) d# 12 4bits d# 15 = end-found ! ; : .alu-op ( -- ) \ d# 25 3 bits 0|1 = + d#20 8bits h# 30 = if .movw exit then d#25 bit? 0= d# 4 bit? and d# 7 bit? and if .ext exit then alu# h# d and h# d = if \ Moves .alu {s} op.rd, .r/imm

1 0

[commit] r2134 - cpu/arm/build
by repository service Jan. 20, 2011

Jan. 20, 2011

Author: wmb Date: Fri Jan 21 01:10:53 2011 New Revision: 2134 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2134 Log: Added FORCE to some build rules in cpu/arm/build/Makefile Modified: cpu/arm/build/Makefile Modified: cpu/arm/build/Makefile ============================================================================== --- cpu/arm/build/Makefile Thu Jan 20 02:14:05 2011 (r2133) +++ cpu/arm/build/Makefile Fri Jan 21 01:10:53 2011 (r2134) @@ -11,10 +11,10 @@ .PRECIOUS: builder.dic -${HOSTDIR}/forth: +${HOSTDIR}/forth: FORCE @make -C ${HOSTDIR} forth -${HOSTDIR}/armforth: +${HOSTDIR}/armforth: FORCE @make -C ${HOSTDIR} armforth build: ${HOSTDIR}/forth ${HOSTDIR}/armforth

1 0

[commit] r2133 - cpu/arm/olpc/1.75 forth/lib
by repository service Jan. 19, 2011

Jan. 19, 2011

Author: wmb Date: Thu Jan 20 02:14:05 2011 New Revision: 2133 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2133 Log: Eliminate the use of the "md5sum" command in the builder scripts for XO-1.75, because OS-X doesn't have that command. Added: forth/lib/md5file.fth Modified: cpu/arm/olpc/1.75/sd8686.bth cpu/arm/olpc/1.75/verify.bth Modified: cpu/arm/olpc/1.75/sd8686.bth ============================================================================== --- cpu/arm/olpc/1.75/sd8686.bth Thu Jan 20 02:12:45 2011 (r2132) +++ cpu/arm/olpc/1.75/sd8686.bth Thu Jan 20 02:14:05 2011 (r2133) @@ -3,23 +3,8 @@ command: &builder &this build-now -char * value prefix -\needs $md5digest1 fload ${BP}/ofw/ppp/md5.fth -: $md5sum-file ( filename$ -- ) - 2dup $read-file ( filename$ adr len ) - 2dup $md5digest1 ( filename$ adr len md5$ ) - 2swap free-mem ( filename$ md5$ ) - " md5string" $new-file ( filename$ md5$ ) - bounds ?do ( filename$ ) - i c@ push-hex <# u# u# u#> ofd @ fputs pop-base - loop ( filename$ ) - " " ofd @ fputs ( filename$ ) - prefix ofd @ fputc ( filename$ ) - ofd @ fputs ( ) - fcr - ofd @ fclose -; - +\needs to-file fload ${BP}/forth/lib/tofile.fth +\needs $md5sum-file fload ${BP}/forth/lib/md5file.fth fload ${BP}/cpu/arm/olpc/1.75/wlan-version.fth @@ -33,14 +18,14 @@ " wget -q http://dev.laptop.org/pub/firmware/libertas/thinfirm/${WLAN_FILE}.bin" expand$ $sh " wget -q http://dev.laptop.org/pub/firmware/libertas/thinfirm/${WLAN_FILE}.bin.md5" expand$ $sh -bl to prefix " ${WLAN_FILE}.bin" expand$ $md5sum-file +to-file md5string " " " ${WLAN_FILE}.bin" expand$ $md5sum-file " cmp md5string ${WLAN_FILE}.bin.md5" expand$ $sh " mv ${WLAN_FILE}.bin sd8686.bin" expand$ $sh " wget -q http://dev.laptop.org/pub/firmware/libertas/sd8686_helper.bin" expand$ $sh " wget -q http://dev.laptop.org/pub/firmware/libertas/sd8686_helper.bin.md5" expand$ $sh -char * to prefix " sd8686_helper.bin" $md5sum-file +to-file md5string " *" " sd8686_helper.bin" $md5sum-file " cmp md5string sd8686_helper.bin.md5" expand$ $sh " rm ${WLAN_FILE}.bin.md5 sd8686_helper.bin.md5 md5string" expand$ $sh Modified: cpu/arm/olpc/1.75/verify.bth ============================================================================== --- cpu/arm/olpc/1.75/verify.bth Thu Jan 20 02:12:45 2011 (r2132) +++ cpu/arm/olpc/1.75/verify.bth Thu Jan 20 02:14:05 2011 (r2133) @@ -3,6 +3,9 @@ command: &builder &this build-now +\needs to-file fload ${BP}/forth/lib/tofile.fth +\needs $md5sum-file fload ${BP}/forth/lib/md5file.fth + fload ${BP}/cpu/arm/olpc/1.75/crypto-version.fth " wget -q http://dev.laptop.org/pub/firmware/crypto/${KEYS}/os.public -O os.public" expand$ $sh @@ -13,10 +16,11 @@ " wget -q http://dev.laptop.org/pub/firmware/crypto/bios_verify-${CRYPTO_VERSION}.img" expand$ $sh " wget -q http://dev.laptop.org/pub/firmware/crypto/bios_verify-${CRYPTO_VERSION}.img…" expand$ $sh -" md5sum -b bios_verify-${CRYPTO_VERSION}.img | cmp - bios_verify-${CRYPTO_VERSION}.img.md5" expand$ $sh +to-file md5string " *" " bios_verify-${CRYPTO_VERSION}.img" expand$ $md5sum-file +" cmp md5string bios_verify-${CRYPTO_VERSION}.img.md5" expand$ $sh " mv bios_verify-${CRYPTO_VERSION}.img verify.img" expand$ $sh -" rm bios_verify-${CRYPTO_VERSION}.img.md5" expand$ $sh +" rm bios_verify-${CRYPTO_VERSION}.img.md5 md5string" expand$ $sh \ This forces the creation of an verify.log file, so we don't re-fetch writing verify.version Added: forth/lib/md5file.fth ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ forth/lib/md5file.fth Thu Jan 20 02:14:05 2011 (r2133) @@ -0,0 +1,28 @@ +purpose: Emulate the Linux md5sum command + +\needs $md5digest1 fload ${BP}/ofw/ppp/md5.fth + +: $md5sum-file ( prefix$ filename$ -- ) + \ Read file into memory and compute its MD5 hash + 2dup $read-file ( prefix$ filename$ adr len ) + 2dup $md5digest1 ( prefix$ filename$ adr len md5$ ) + 2swap free-mem ( prefix$ filename$ md5$ ) + + \ Write the hash and the filename in the same format as + \ the output of the Linux "md5sum" command. prefix$ should + \ be " *" to match the output of "md5sum -b" and " " + \ to match the output of "md5sum" without -b. + + \ Output MD5 in lower case ASCII hex + push-hex ( prefix$ filename$ md5$ ) + bounds ?do ( prefix$ filename$ ) + i c@ <# u# u# u#> type + loop ( prefix$ filename$ ) + pop-base ( prefix$ filename$ ) + + \ ... followed by " filename" or " *filename" + ." " ( prefix$ filename$ ) + 2swap type ( filename$ ) + type ( ) + cr +;

1 0

[commit] r2132 - forth/wrapper
by repository service Jan. 19, 2011

Jan. 19, 2011

Author: wmb Date: Thu Jan 20 02:12:45 2011 New Revision: 2132 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2132 Log: Initial revision of null implementation of ZIP routines for wrapper. Added: forth/wrapper/nullzip.c Added: forth/wrapper/nullzip.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ forth/wrapper/nullzip.c Thu Jan 20 02:12:45 2011 (r2132) @@ -0,0 +1,11 @@ +/* + * Stub versions of zip_memory() and inflate() for organizations + * immune to the license of the code that implementes zip_memory() + */ +zip_memory() +{ +} + +inflate() +{ +}

1 0

[commit] r2131 - cpu/arm/olpc/1.75
by repository service Jan. 19, 2011

Jan. 19, 2011

Author: wmb Date: Thu Jan 20 01:39:30 2011 New Revision: 2131 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2131 Log: Eliminated the need for the md5sum command (not present on Mac OS) in the sd8686.bth script. Modified: cpu/arm/olpc/1.75/sd8686.bth Modified: cpu/arm/olpc/1.75/sd8686.bth ============================================================================== --- cpu/arm/olpc/1.75/sd8686.bth Thu Jan 20 01:04:21 2011 (r2130) +++ cpu/arm/olpc/1.75/sd8686.bth Thu Jan 20 01:39:30 2011 (r2131) @@ -3,6 +3,24 @@ command: &builder &this build-now +char * value prefix +\needs $md5digest1 fload ${BP}/ofw/ppp/md5.fth +: $md5sum-file ( filename$ -- ) + 2dup $read-file ( filename$ adr len ) + 2dup $md5digest1 ( filename$ adr len md5$ ) + 2swap free-mem ( filename$ md5$ ) + " md5string" $new-file ( filename$ md5$ ) + bounds ?do ( filename$ ) + i c@ push-hex <# u# u# u#> ofd @ fputs pop-base + loop ( filename$ ) + " " ofd @ fputs ( filename$ ) + prefix ofd @ fputc ( filename$ ) + ofd @ fputs ( ) + fcr + ofd @ fclose +; + + fload ${BP}/cpu/arm/olpc/1.75/wlan-version.fth " macro: WLAN_FILE lbtf_sdio-${WLAN_VERSION}" expand$ eval @@ -14,15 +32,18 @@ " wget -q http://dev.laptop.org/pub/firmware/libertas/thinfirm/${WLAN_FILE}.bin" expand$ $sh " wget -q http://dev.laptop.org/pub/firmware/libertas/thinfirm/${WLAN_FILE}.bin.md5" expand$ $sh -" md5sum ${WLAN_FILE}.bin | cmp - ${WLAN_FILE}.bin.md5" expand$ $sh + +bl to prefix " ${WLAN_FILE}.bin" expand$ $md5sum-file +" cmp md5string ${WLAN_FILE}.bin.md5" expand$ $sh " mv ${WLAN_FILE}.bin sd8686.bin" expand$ $sh " wget -q http://dev.laptop.org/pub/firmware/libertas/sd8686_helper.bin" expand$ $sh " wget -q http://dev.laptop.org/pub/firmware/libertas/sd8686_helper.bin.md5" expand$ $sh -" md5sum -b sd8686_helper.bin | cmp - sd8686_helper.bin.md5" expand$ $sh +char * to prefix " sd8686_helper.bin" $md5sum-file +" cmp md5string sd8686_helper.bin.md5" expand$ $sh -" rm ${WLAN_FILE}.bin.md5 sd8686_helper.bin.md5" expand$ $sh +" rm ${WLAN_FILE}.bin.md5 sd8686_helper.bin.md5 md5string" expand$ $sh [then] \ This forces the creation of a .log file, so we don't re-fetch

1 0

[commit] r2130 - cpu/x86/Darwin
by repository service Jan. 19, 2011

Jan. 19, 2011

Author: wmb Date: Thu Jan 20 01:04:21 2011 New Revision: 2130 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2130 Log: Darwin/Makefile.armforth deleted, rules having been moved into Makefile Deleted: cpu/x86/Darwin/Makefile.armforth

1 0