Changeset 3060


Ignore:
Timestamp:
Jul 12, 2012, 9:02:13 PM (3 years ago)
Author:
wmb
Message:

OLPC ARM - split previously-ifdef'ed testitems.fth file into per-platform non-ifdef'ed versions.

Location:
cpu/arm/olpc
Files:
2 added
5 edited

Legend:

Unmodified
Added
Removed
  • cpu/arm/olpc/1.75/fw.bth

    r3049 r3060  
    4040fload ${BP}/cpu/arm/olpc/1.75/switches.fth
    4141fload ${BP}/cpu/arm/olpc/1.75/leds.fth
     42fload ${BP}/cpu/arm/olpc/1.75/testitems.fth
    4243fload ${BP}/cpu/arm/olpc/1.75/testinstructions.fth
    4344fload ${BP}/cpu/arm/olpc/gpio-gamekeys.fth
  • cpu/arm/olpc/1.75/testitems.fth

    r3059 r3060  
    1313icon: wifi.icon     rom:wifi.565
    1414icon: audio.icon    rom:audio.565
    15 \- olpc-cl3 icon: touchpad.icon rom:touchpad.565
    16 \+ olpc-cl3 icon: touchscreen.icon rom:touchpad.565
     15icon: touchpad.icon rom:touchpad.565
    1716icon: display.icon  rom:display.565
    18 \- olpc-cl3 icon: keyboard.icon rom:keyboard.565
     17icon: keyboard.icon rom:keyboard.565
    1918icon: timer.icon    rom:timer.565
    2019icon: clock.icon    rom:clock.565
     
    2221icon: leds.icon     rom:leds.565
    2322
    24 \+ olpc-cl3  : screen-kbd-scroller  ( -- )  blank-screen  open-screen-keyboard  ;
    25 \+ olpc-cl3  ' screen-kbd-scroller to scroller-on
    26 \+ olpc-cl3  ' close-screen-keyboard to scroller-off
    2723
    2824: cpu-item      ( -- )  " /cpu"       mfg-test-dev  ;
     
    3026: spiflash-item ( -- )  " /flash"     mfg-test-dev  ;
    3127: memory-item   ( -- )  " /memory"    mfg-test-dev  ;
    32 \+ olpc-cl2  : usb-item   ( -- )  " /usb/hub"   mfg-test-dev  ;
    33 \+ olpc-cl3  : otg-item   ( -- )  " otg"        mfg-test-dev  ;
    34 \+ olpc-cl3  : usb-item   ( -- )  " usba"       mfg-test-dev  ;
     28: usb-item   ( -- )  " /usb/hub"   mfg-test-dev  ;
    3529: int-sd-item   ( -- )  " int:0"      mfg-test-dev  ;
    36 \- olpc-cl3 : ext-sd-item   ( -- )  " ext:0"      mfg-test-dev  ;
     30: ext-sd-item   ( -- )  " ext:0"      mfg-test-dev  ;
    3731: rtc-item      ( -- )  " /rtc"       mfg-test-dev  ;
    3832: display-item  ( -- )  " /display"   gfx-test-dev  ;
     
    4135: wlan-item     ( -- )  " /wlan"      mfg-test-dev  ;
    4236: timer-item    ( -- )  " /timer"     mfg-test-dev  ;
    43 \- olpc-cl3 : touchpad-item ( -- )  " mouse"  mfg-test-dev  ;
    44 \+ olpc-cl3 : touchscreen-item ( -- )  " /touchscreen"  gfx-test-dev  ;
    45 \- olpc-cl3 : keyboard-item ( -- )  " keyboard"   mfg-test-dev  ;
     37: touchpad-item ( -- )  " mouse"  mfg-test-dev  ;
     38: keyboard-item ( -- )  " keyboard"   mfg-test-dev  ;
    4639: switch-item   ( -- )  " /accelerometer" mfg-test-dev  " /switches"  mfg-test-dev  ;
    4740: leds-item     ( -- )  " /leds"      mfg-test-dev   ;
     
    6356   ['] int-sd-item    sdcard.icon   add-icon
    6457
    65 \- olpc-cl3  " Plug-in SD card"
    66 \- olpc-cl3  ['] ext-sd-item  sdcard.icon  add-icon
     58   " Plug-in SD card"
     59   ['] ext-sd-item  sdcard.icon  add-icon
    6760
    6861   " Wireless LAN"
     
    8477   ['] rtc-item       clock.icon    add-icon
    8578
    86 \+ olpc-cl2  " USB ports"
    87 \+ olpc-cl3  " USB-A port"
     79   " USB ports"
    8880   ['] usb-item       usb.icon      add-icon
    8981
    90 \+ olpc-cl3  " USB OTG port"
    91 \+ olpc-cl3  ['] otg-item  usb.icon  add-icon
    9282
    9383   \ These are last because they require user participation.
    9484   \ The earlier tests are all included in automatic batch-mode.
    9585
    96 \- olpc-cl3  " Keyboard"
    97 \- olpc-cl3  ['] keyboard-item     keyboard.icon     add-icon
     86   " Keyboard"
     87   ['] keyboard-item     keyboard.icon     add-icon
    9888
    99 \- olpc-cl3  " Touchpad"
    100 \- olpc-cl3  ['] touchpad-item     touchpad.icon     add-icon
     89   " Touchpad"
     90   ['] touchpad-item     touchpad.icon     add-icon
    10191
    102 \+ olpc-cl3  " Touchscreen"
    103 \+ olpc-cl3  ['] touchscreen-item  touchscreen.icon  add-icon
    10492
    10593   " LEDs"
  • cpu/arm/olpc/3.0/fw.bth

    r3049 r3060  
    1818fload ${BP}/cpu/arm/olpc/3.0/switches.fth
    1919fload ${BP}/cpu/arm/olpc/3.0/leds.fth
     20fload ${BP}/cpu/arm/olpc/3.0/testitems.fth
    2021fload ${BP}/cpu/arm/olpc/3.0/testinstructions.fth
    2122fload ${BP}/cpu/arm/olpc/test-tweaks.fth
  • cpu/arm/olpc/build-fw.fth

    r3059 r3060  
    794794: ?text-on  ( -- )  key?  if  text-on visible  then  ;
    795795[then]
    796 
    797 fload ${BP}/cpu/arm/olpc/1.75/testitems.fth
    798796
    799797: startup  ( -- )
  • cpu/arm/olpc/cl4/fw.bth

    r3055 r3060  
    3535fload ${BP}/cpu/arm/olpc/cl4/switches.fth
    3636fload ${BP}/cpu/arm/olpc/cl4/leds.fth
     37fload ${BP}/cpu/arm/olpc/cl4/testitems.fth
    3738fload ${BP}/cpu/arm/olpc/cl4/testinstructions.fth
    3839fload ${BP}/cpu/arm/olpc/gpio-gamekeys.fth
Note: See TracChangeset for help on using the changeset viewer.