October 2011 - openfirmware - mail.coreboot.org

[commit] r2648 - cpu/arm/olpc/1.75
by repository service Oct. 24, 2011

Oct. 24, 2011

Author: wmb Date: Mon Oct 24 04:51:29 2011 New Revision: 2648 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2648 Log: OLPC XO-1.75 - changed USB post-hub-port-power-on delay to 350 ms to fix a problem with some Belkin USB sticks. Modified: cpu/arm/olpc/1.75/usb.fth Modified: cpu/arm/olpc/1.75/usb.fth ============================================================================== --- cpu/arm/olpc/1.75/usb.fth Mon Oct 24 01:54:24 2011 (r2647) +++ cpu/arm/olpc/1.75/usb.fth Mon Oct 24 04:51:29 2011 (r2648) @@ -41,7 +41,7 @@ init-usb ; -d# 300 config-int usb-delay \ Milliseconds to wait before probing hub ports +d# 350 config-int usb-delay \ Milliseconds to wait before probing hub ports devalias u /usb/disk

1 0

[commit] r2647 - cpu/x86/pc/olpc/via
by repository service Oct. 24, 2011

Oct. 24, 2011

Author: quozl Date: Mon Oct 24 01:54:24 2011 New Revision: 2647 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2647 Log: Q3B21 (note that this version was not svn head at this point, but rather svn 2478 [q3b19] with 2589 and 2597 [q3b20]) Modified: cpu/x86/pc/olpc/via/fw-version.fth Modified: cpu/x86/pc/olpc/via/fw-version.fth ============================================================================== --- cpu/x86/pc/olpc/via/fw-version.fth Sun Oct 23 01:36:39 2011 (r2646) +++ cpu/x86/pc/olpc/via/fw-version.fth Mon Oct 24 01:54:24 2011 (r2647) @@ -1,3 +1,3 @@ \ The overall firmware revision macro: FW_MAJOR B -macro: FW_MINOR 20 +macro: FW_MINOR 21

1 0

[commit] r2646 - cpu/arm/olpc/1.75
by repository service Oct. 23, 2011

Oct. 23, 2011

Author: wmb Date: Sun Oct 23 01:36:39 2011 New Revision: 2646 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2646 Log: q4b12mk Modified: cpu/arm/olpc/1.75/fw-version.fth Modified: cpu/arm/olpc/1.75/fw-version.fth ============================================================================== --- cpu/arm/olpc/1.75/fw-version.fth Sun Oct 23 01:36:33 2011 (r2645) +++ cpu/arm/olpc/1.75/fw-version.fth Sun Oct 23 01:36:39 2011 (r2646) @@ -1,3 +1,3 @@ \ The overall firmware revision macro: FW_MAJOR B -macro: FW_MINOR 12mj +macro: FW_MINOR 12mk

1 0

[commit] r2645 - ofw/fs/ext2fs
by repository service Oct. 23, 2011

Oct. 23, 2011

Author: wmb Date: Sun Oct 23 01:36:33 2011 New Revision: 2645 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2645 Log: ext2/3 file system - added ext3 journal recovery. Modified: ofw/fs/ext2fs/ext2fs.fth ofw/fs/ext2fs/ext2test.sh ofw/fs/ext2fs/layout.fth ofw/fs/ext2fs/methods.fth ofw/fs/ext2fs/recovery.fth ofw/fs/ext2fs/sb.fth Modified: ofw/fs/ext2fs/ext2fs.fth ============================================================================== --- ofw/fs/ext2fs/ext2fs.fth Sat Oct 22 12:40:13 2011 (r2644) +++ ofw/fs/ext2fs/ext2fs.fth Sun Oct 23 01:36:33 2011 (r2645) @@ -10,7 +10,9 @@ fload ${BP}/ofw/fs/ext2fs/bitmap.fth fload ${BP}/ofw/fs/ext2fs/layout.fth fload ${BP}/ofw/fs/ext2fs/dir.fth +fload ${BP}/ofw/fs/ext2fs/recovery.fth fload ${BP}/ofw/fs/ext2fs/methods.fth + \ LICENSE_BEGIN \ Copyright (c) 2006 FirmWorks \ Modified: ofw/fs/ext2fs/ext2test.sh ============================================================================== --- ofw/fs/ext2fs/ext2test.sh Sat Oct 22 12:40:13 2011 (r2644) +++ ofw/fs/ext2fs/ext2test.sh Sun Oct 23 01:36:33 2011 (r2645) @@ -63,10 +63,11 @@ if [ ! -b "${DEVICE}" ]; then echo REMAKING FILE rm -f "${DEVICE}" -dd if=/dev/zero of=${DEVICE} bs=512 count=1 seek=8388000 2> /dev/null #8388608 +# dd if=/dev/zero of=${DEVICE} bs=512 count=1 seek=8388000 2> /dev/null #8388608 # dd if=/dev/zero of=${DEVICE} bs=512 count=1 seek=4194303 2> /dev/null -#dd if=/dev/zero of=${DEVICE} bs=512 count=1 seek=2097151 2> /dev/null -#dd if=/dev/zero of=${DEVICE} bs=512 count=1 seek=1050000 2> /dev/null +# dd if=/dev/zero of=${DEVICE} bs=512 count=1 seek=2097151 2> /dev/null +# dd if=/dev/zero of=${DEVICE} bs=512 count=1 seek=1050000 2> /dev/null +dd if=/dev/zero of=${DEVICE} bs=512 count=1 seek=10000 2> /dev/null # 5 MiB chmod 666 ${DEVICE} fi # if [ ! -b "${DEVICE}" -a ! -f "${DEVICE}" ]; then @@ -123,7 +124,7 @@ echo -n "make filesystem ... " #/sbin/mke2fs -n -b 4096 -q ${PARTITION} # /sbin/mke2fs -n -j -O dir_index,^huge_file -E resize=8G -m 1 -b 4096 -q ${PARTITION} -/sbin/mke2fs -n -j -O dir_index -m 1 -b 1024 -q ${PARTITION} +/sbin/mke2fs -j -O dir_index -m 1 -b 1024 -q ${PARTITION} echo "made" # we occasionally get @@ -133,12 +134,12 @@ until mount ${PARTITION} /mnt; do sleep 0.1; done echo "mounted" -echo -n "create test content and unmount ... " +echo "create test content" mkdir /mnt/boot cp ext2test.fth /mnt/boot/olpc.fth -cd /mnt +pushd /mnt touch touched echo hello > hello echo hello world > hello-world @@ -151,11 +152,23 @@ echo hello world down here > directory/hw mkfifo fifo mknod node b 1 1 -cd +popd + +if [ ! -b ${DEVICE} ] ; then + echo -n "save dirty journal ..." + sleep 10 + cp ${DEVICE} ${DEVICE}.dirty +fi + +echo -n "unmount ... " umount /mnt +sync if [ ! -b ${DEVICE} ] ; then /sbin/losetup -d ${PARTITION} + sync + mv ${DEVICE} ${DEVICE}.clean + cp ${DEVICE}.dirty ${DEVICE}.test fi echo "finished" Modified: ofw/fs/ext2fs/layout.fth ============================================================================== --- ofw/fs/ext2fs/layout.fth Sat Oct 22 12:40:13 2011 (r2644) +++ ofw/fs/ext2fs/layout.fth Sun Oct 23 01:36:33 2011 (r2645) @@ -211,7 +211,8 @@ else \ find or allocate physical block get-pblk# ( adr pblk# ) then - dup h# f8 < if dup . ." attempt to destroy file system" cr abort then +\ This interferes with journal recovery +\ dup h# f8 < if dup . ." attempt to destroy file system" cr abort then block bsize move update ; Modified: ofw/fs/ext2fs/methods.fth ============================================================================== --- ofw/fs/ext2fs/methods.fth Sat Oct 22 12:40:13 2011 (r2644) +++ ofw/fs/ext2fs/methods.fth Sun Oct 23 01:36:33 2011 (r2645) @@ -216,6 +216,8 @@ my-args " <NoFile>" $= if true exit then + recover? if process-journal then + \ Start out in the root directory set-root Modified: ofw/fs/ext2fs/recovery.fth ============================================================================== --- ofw/fs/ext2fs/recovery.fth Sat Oct 22 12:40:13 2011 (r2644) +++ ofw/fs/ext2fs/recovery.fth Sun Oct 23 01:36:33 2011 (r2645) @@ -6,6 +6,21 @@ /l field >h_sequence constant /journal-header +\ Superblock - blocktype 3 (version 1) or 4 (version 2) +/journal-header + /l field >s_blocksize + /l field >s_maxlen + /l field >s_first + /l field >s_sequence + /l field >s_start + /l field >s_errno + /l field >s_feature_compat + /l field >s_feature_incompat + /l field >s_feature_ro_compat + \ We don't need the rest +drop + +\ Commit header - blocktype 2 /journal-header /c field >h_chksum_type /c field >h_chksum_size @@ -15,10 +30,13 @@ /l field >h_commit_nsec constant /commit-header +\ Revoke header - blocktype 5 /journal-header /l field >r_count constant /revoke-header +\ Descriptor block - blocktype 1 - journal header followed by an array of tags +\ Tag - 32-bit and 64-bit forms struct /l field >t_blocknr /l field >t_flags @@ -26,19 +44,6 @@ /l field >t_blocknr_high constant /tag64 -/journal-header - /l field >s_blocksize - /l field >s_maxlen - /l field >s_first - /l field >s_sequence - /l field >s_start - /l field >s_errno - /l field >s_feature_compat - /l field >s_feature_incompat - /l field >s_feature_ro_compat - \ We don't need the rest -drop - 0 value j-buf 0 value j-compat 0 value j-incompat @@ -72,7 +77,7 @@ then jsb >s_start be-l@ to j-start - jsb 0= if + j-start 0= if free-journal true exit ( -- skip? ) then @@ -333,6 +338,7 @@ then ; : commit-journal ( -- ) + jsb >s_sequence dup be-l@ 1+ swap be-l! 0 jsb >s_start be-l! jsb 0 write-file-block flush @@ -340,6 +346,8 @@ : process-journal ( -- ) read-journal if exit then +." Recovering from journal ... " + 0 ['] one-pass catch if ." Journal scan failed" cr free-journal exit @@ -357,6 +365,7 @@ free-revoke-list - \ commit-journal + commit-journal free-journal +cr ; Modified: ofw/fs/ext2fs/sb.fth ============================================================================== --- ofw/fs/ext2fs/sb.fth Sat Oct 22 12:40:13 2011 (r2644) +++ ofw/fs/ext2fs/sb.fth Sun Oct 23 01:36:33 2011 (r2645) @@ -48,10 +48,10 @@ : total-free-inodes! ( -- n ) super-block 4 la+ int! ; : #groups ( -- n ) total-blocks bpg ceiling ; +: recover? ( -- flag ) 24 +sbl 4 and 0<> ; + \ Don't write to a disk that uses extensions we don't understand : unknown-extensions? ( -- unsafe? ) - 24 +sbl 4 and if ." ext3 journal needs recovery" cr then - 23 +sbl h# ffffffff invert and \ Accept all compat extensions 24 +sbl h# 00000002 invert and or \ Incompatible - accept FILETYPE 25 +sbl h# 00000003 invert and or \ RO - accept SPARSE_SUPER and LARGE_FILE

1 0

[commit] r2644 - in cpu/arm: . mmp2 olpc/1.75
by repository service Oct. 22, 2011

Oct. 22, 2011

Author: wmb Date: Sat Oct 22 12:40:13 2011 New Revision: 2644 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2644 Log: OLPC XO-1.75 - Fixed emacs by revamping the DMA allocation code, separating the DMA memory list from the physical memlist. DMA memory is mapped uncached, while other memory is cacheable, so conflating them is not a good idea. Modified: cpu/arm/linux.fth cpu/arm/mmp2/rootnode.fth cpu/arm/olpc/1.75/fw.bth cpu/arm/olpc/1.75/probemem.fth Modified: cpu/arm/linux.fth ============================================================================== --- cpu/arm/linux.fth Sat Oct 22 12:40:07 2011 (r2643) +++ cpu/arm/linux.fth Sat Oct 22 12:40:13 2011 (r2644) @@ -9,8 +9,9 @@ 0 value linux-memtop +defer memory-limit \ Find the end of the largest piece of memory -: memory-limit ( -- limit ) +: (memory-limit) ( -- limit ) \ If we have already loaded a RAMdisk in high memory, its base is the memory limit ramdisk-adr ?dup if exit then @@ -30,6 +31,7 @@ 2drop ( size base ) + ( limit ) ; +' (memory-limit) to memory-limit \ Override by platform code if necessary \ see http://www.simtec.co.uk/products/SWLINUX/files/booting_article.html Modified: cpu/arm/mmp2/rootnode.fth ============================================================================== --- cpu/arm/mmp2/rootnode.fth Sat Oct 22 12:40:07 2011 (r2643) +++ cpu/arm/mmp2/rootnode.fth Sat Oct 22 12:40:13 2011 (r2644) @@ -34,54 +34,14 @@ 2drop ; -: dma-range ( -- start end ) dma-mem-va >physical dup /dma-mem + ; - +[ifdef] virtual-mode h# 0 constant dma-map-mode \ XXX what should this be? - -\ Used with "find-node" to locate a physical memory node containing -\ enough memory in the DMA range. -\ We first compute the intersection between the memory piece and the -\ range reachable by DMA. If the regions are disjoint, then ok-high -\ will be (unsigned) less than ok-low. We then subtract ok-low from -\ ok-high to give the (possibly negative) size of the intersection. -: in-range? ( size mem-low mem-high range-low range-high -- flag ) - rot umin -rot ( size min-high mem-low mem-high ) - umax ( size min-high max-low ) - - <= ( flag ) -; - -: dma-ok? ( size node-adr -- size flag ) - node-range ( size mem-adr mem-len ) - over + ( size mem-adr mem-end ) - - 3dup dma-range in-range? if ( size mem-adr mem-end ) - 2drop true exit ( size true ) - then ( size mem-adr mem-end ) - - 2drop false ( size false ) -; - -\ Find an available physical address range suitable for DMA. This word -\ doesn't actually claim the memory (that is done later), but simply locates -\ a suitable range that can be successfully claimed. -: find-dma-address ( size -- true | adr false ) - " physavail" memory-node @ $call-method ( list ) - ['] dma-ok? find-node is next-node drop ( size' ) - next-node 0= if drop true exit then ( size' ) - next-end ( size mem-end ) - dma-range ( size mem-end range-l,h ) - nip umin swap - false ( adr false ) -; +[then] headers : dma-alloc ( size -- virt ) - pagesize round-up - - \ Locate a suitable physical range - dup find-dma-address throw ( size' phys ) - - \ Claim it - over 0 mem-claim ( size' phys ) + \ Allocate the physical memory + dup " allocate-dma-phys" $call-mem-method ( size' phys ) [ifdef] virtual-mode \ Get a virtual range @@ -111,7 +71,7 @@ swap >physical swap ( virt ) [then] [then] - mem-release ( ) + " free-dma-phys" $call-mem-method ( ) ; : dma-map-in ( virt size cacheable -- devaddr ) Modified: cpu/arm/olpc/1.75/fw.bth ============================================================================== --- cpu/arm/olpc/1.75/fw.bth Sat Oct 22 12:40:07 2011 (r2643) +++ cpu/arm/olpc/1.75/fw.bth Sat Oct 22 12:40:13 2011 (r2644) @@ -27,6 +27,11 @@ fload ${BP}/cpu/arm/linux.fth +\ The bottom of extra-mem is the top of DMA memory. +\ We give everything up to that address to Linux. +: olpc-memory-limit ( -- adr ) extra-mem-va >physical ; +' olpc-memory-limit to memory-limit + : usb-quiet ( -- ) [ ' linux-hook behavior compile, ] \ Chain to old behavior unload-crypto Modified: cpu/arm/olpc/1.75/probemem.fth ============================================================================== --- cpu/arm/olpc/1.75/probemem.fth Sat Oct 22 12:40:07 2011 (r2643) +++ cpu/arm/olpc/1.75/probemem.fth Sat Oct 22 12:40:13 2011 (r2644) @@ -8,18 +8,28 @@ headerless -h# ffff.ffff value low -h# 0 value high +list: dmaavail 0 dmaavail ! -: log&release ( adr len -- ) - over low umin to low ( adr len ) - 2dup + high umax to high ( adr len ) - release +headers +: allocate-dma-phys ( size -- phys ) + \ Minumum granularity of memory chunks is 1 page + pagesize round-up ( size' ) + + pagesize over dmaavail ( size alignment size list ) + allocate-memrange ( size [ adr ] error? ) + abort" Insufficient DMA memory" ( size adr ) + dup rot clear-mem ( phys ) +; + +: free-dma-phys ( phys size -- ) + >page-boundaries ( adr' size' ) + ['] 2drop is ?splice ( adr' size' ) + dmaavail free-memrange ; headers : probe ( -- ) - 0 fb-mem-va >physical /fb-mem + log&release + 0 fb-mem-va >physical /fb-mem + release 0 0 encode-bytes ( adr 0 ) physavail ['] make-phys-memlist find-node ( adr len prev 0 ) @@ -29,6 +39,9 @@ fb-mem-va >physical /fb-mem 0 claim drop fw-mem-va >physical /fw-mem 0 claim drop extra-mem-va >physical /extra-mem 0 claim drop + dma-mem-va >physical /dma-mem 0 claim drop + + dma-mem-va >physical /dma-mem free-dma-phys 0 pagesize 0 claim drop \ Vector table ;

1 0

[commit] r2643 - cpu/arm/mmp2
by repository service Oct. 22, 2011

Oct. 22, 2011

Author: wmb Date: Sat Oct 22 12:40:07 2011 New Revision: 2643 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2643 Log: OLPC XO-1.75 - Fixed a name collision with timers-off . Modified: cpu/arm/mmp2/dramrecal.fth Modified: cpu/arm/mmp2/dramrecal.fth ============================================================================== --- cpu/arm/mmp2/dramrecal.fth Sat Oct 22 07:20:13 2011 (r2642) +++ cpu/arm/mmp2/dramrecal.fth Sat Oct 22 12:40:07 2011 (r2643) @@ -677,7 +677,7 @@ : wlan-stay-on ( -- ) h# 140 d# 34 af! h# 140 d# 57 af! h# 140 d# 58 af! ; 0 value sleep-mask -: screen-off +: screen-sleep sleep-mask 1 and if \ DCON power down dcon-freeze else @@ -696,7 +696,7 @@ wlan-power-off then \ saves 100 mW ; -: screen-on ( -- ) +: screen-wake ( -- ) sleep-mask 4 and 0= if wlan-power-on " /wlan" " wake" execute-device-method drop @@ -714,12 +714,12 @@ : stdin-idle-on ['] safe-idle to stdin-idle d# 15 enable-interrupt ; : stdin-idle-off ['] noop to stdin-idle ( install-uart-io ) d# 15 disable-interrupt ; -: timers-off ( -- ) +: timers-sleep ( -- ) 0 h# 14048 io! \ Disable interrupts from the tick timer 7 h# 1407c io! \ Clear any pending interrupts h# f disable-interrupt \ Block timer interrupt ; -: timers-on ( -- ) +: timers-wake ( -- ) 1 h# 14048 io! \ Enable interrupts from the tick timer 7 h# 1407c io! \ Clear any pending interrupts h# f enable-interrupt \ Unblock timer interrupt @@ -736,9 +736,9 @@ : str ( -- ) disable-interrupts suspend-usb - timers-off + timers-sleep - screen-off + screen-sleep stdin-idle-off 5 h# 38 mpmu! \ Use 32 kHz clock instead of VCXO for slow clock @@ -779,8 +779,8 @@ \ idle_cfg &= (~PMUA_MOH_SRAM_PWRDWN); stdin-idle-on - screen-on - timers-on + screen-wake + timers-wake resume-usb enable-interrupts ;

1 0

[commit] r2642 - cpu/arm/olpc/1.75
by repository service Oct. 22, 2011

Oct. 22, 2011

Author: wmb Date: Sat Oct 22 07:20:13 2011 New Revision: 2642 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2642 Log: Q4B12mj Modified: cpu/arm/olpc/1.75/fw-version.fth Modified: cpu/arm/olpc/1.75/fw-version.fth ============================================================================== --- cpu/arm/olpc/1.75/fw-version.fth Sat Oct 22 07:20:07 2011 (r2641) +++ cpu/arm/olpc/1.75/fw-version.fth Sat Oct 22 07:20:13 2011 (r2642) @@ -1,3 +1,3 @@ \ The overall firmware revision macro: FW_MAJOR B -macro: FW_MINOR 12mi +macro: FW_MINOR 12mj

1 0

[commit] r2641 - cpu/arm/olpc/1.75
by repository service Oct. 22, 2011

Oct. 22, 2011

Author: wmb Date: Sat Oct 22 07:20:07 2011 New Revision: 2641 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2641 Log: OLPC XO-1.75 - Change the sleep state of EC_SPI_ACK from 1 (OFW value) to 0 (Linux value) when entering Linux. This lets Linux respond to upstream events from the EC during sleep. Modified: cpu/arm/olpc/1.75/fw.bth Modified: cpu/arm/olpc/1.75/fw.bth ============================================================================== --- cpu/arm/olpc/1.75/fw.bth Sat Oct 22 07:20:01 2011 (r2640) +++ cpu/arm/olpc/1.75/fw.bth Sat Oct 22 07:20:07 2011 (r2641) @@ -36,6 +36,8 @@ timers-off usb-quiet close-ec + \ Change the sleep state of EC_SPI_ACK from 1 (OFW value) to 0 (Linux value) + d# 125 af@ h# 100 invert and d# 125 af! ; ' quiesce to linux-hook

1 0

[commit] r2640 - cpu/arm/mmp2
by repository service Oct. 22, 2011

Oct. 22, 2011

Author: wmb Date: Sat Oct 22 07:20:01 2011 New Revision: 2640 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2640 Log: OLPC XO-1.75 - synchronized mfpr.fth with the version in CForth. Should be no functional change. Modified: cpu/arm/mmp2/mfpr.fth Modified: cpu/arm/mmp2/mfpr.fth ============================================================================== --- cpu/arm/mmp2/mfpr.fth Sat Oct 22 07:19:56 2011 (r2639) +++ cpu/arm/mmp2/mfpr.fth Sat Oct 22 07:20:01 2011 (r2640) @@ -36,7 +36,7 @@ : gpio>mfpr ( gpio# -- mfpr-pa ) mfpr-offsets swap wa+ w@ h# 01.e000 + -; +; : dump-mfprs ( -- ) base @ @@ -47,7 +47,20 @@ : no-update, ( -- ) 8 w, ; \ 8 is a reserved bit; the code skips these : af@ ( gpio# -- function# ) gpio>mfpr io@ ; : af! ( function# gpio# -- ) gpio>mfpr io! ; -: af, ( n -- ) h# c0 + w, ; -: +fast ( n -- n' ) h# 1800 or ; -: pull-up, ( n -- ) h# c0c0 + w, ; -: pull-dn, ( n -- ) h# a0c0 + w, ; + +: +edge-clr ( n -- n' ) h# 40 or ; +: +medium ( n -- n' ) h# 1000 or ; +: +fast ( n -- n' ) h# 1800 or ; +: +twsi ( n -- n' ) h# 400 or ; +: +pull-up ( n -- n' ) h# c000 or ; +: +pull-dn ( n -- n' ) h# a000 or ; +: +pull-up-alt ( n -- n' ) h# 4000 or ; +: +pull-dn-alt ( n -- n' ) h# 2000 or ; + +\ We always start with edge detection off; it can be turned on later as needed +: af, ( n -- ) +edge-clr w, ; + +: sleep- ( n -- n' ) h# 0200 or ; +: sleep0 ( n -- n' ) h# 0000 or ; +: sleep1 ( n -- n' ) h# 0100 or ; +: sleepi ( n -- n' ) h# 0080 or ;

1 0

[commit] r2639 - cpu/arm/olpc/1.75
by repository service Oct. 22, 2011

Oct. 22, 2011

Author: wmb Date: Sat Oct 22 07:19:56 2011 New Revision: 2639 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2639 Log: OLPC XO-1.75 - selftest - moved the accelerometer test before the switches test to avoid accerometer failures due to moving the machine while performing the switches test. Modified: cpu/arm/olpc/1.75/fw-version.fth cpu/arm/olpc/1.75/mfgtest.fth Modified: cpu/arm/olpc/1.75/fw-version.fth ============================================================================== --- cpu/arm/olpc/1.75/fw-version.fth Sat Oct 22 06:25:07 2011 (r2638) +++ cpu/arm/olpc/1.75/fw-version.fth Sat Oct 22 07:19:56 2011 (r2639) @@ -1,3 +1,3 @@ \ The overall firmware revision macro: FW_MAJOR B -macro: FW_MINOR 12 +macro: FW_MINOR 12mi Modified: cpu/arm/olpc/1.75/mfgtest.fth ============================================================================== --- cpu/arm/olpc/1.75/mfgtest.fth Sat Oct 22 06:25:07 2011 (r2638) +++ cpu/arm/olpc/1.75/mfgtest.fth Sat Oct 22 07:19:56 2011 (r2639) @@ -143,9 +143,8 @@ : timer-item ( -- ) " /timer" mfg-test-dev ; : touchpad-item ( -- ) " mouse" mfg-test-dev ; : keyboard-item ( -- ) " keyboard" mfg-test-dev ; -: switch-item ( -- ) " /switches" mfg-test-dev " /accelerometer" mfg-test-dev ; +: switch-item ( -- ) " /accelerometer" mfg-test-dev " /switches" mfg-test-dev ; : leds-item ( -- ) " /leds" mfg-test-dev ; -\ XXX need to test sensors like accelerometer and compass : olpc-menu-items ( -- ) clear-menu

1 0