[commit] r3059 - in cpu/arm/olpc: . 1.75

[repository service]

Author: wmb
Date: Thu Jul 12 22:49:36 2012
New Revision: 3059
URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3059

Log:
OLPC ARM - moved cpu/arm/olpc/testitems.fth down into 1.75 in preparation for copying into different platform directories and removing ifdefs.

Added:
   cpu/arm/olpc/1.75/testitems.fth
      - copied unchanged from r3050, cpu/arm/olpc/testitems.fth
Deleted:
   cpu/arm/olpc/testitems.fth
Modified:
   cpu/arm/olpc/build-fw.fth

Copied: cpu/arm/olpc/1.75/testitems.fth (from r3050, cpu/arm/olpc/testitems.fth)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ cpu/arm/olpc/1.75/testitems.fth	Thu Jul 12 22:49:36 2012	(r3059, copy of r3050, cpu/arm/olpc/testitems.fth)
@@ -0,0 +1,111 @@
+purpose: Platform-specific layout of diagnostic GUI menu items
+
+d# 5 to #mfgcols
+d# 4 to #mfgrows
+
+icon: cpu.icon      rom:cpu.565
+icon: spi.icon      rom:spi.565
+icon: ram.icon      rom:ram.565
+icon: sdcard.icon   rom:sdcard.565
+icon: usb.icon      rom:usb.565
+icon: battery.icon  rom:battery.565
+icon: camera.icon   rom:camera.565
+icon: wifi.icon     rom:wifi.565
+icon: audio.icon    rom:audio.565
+- olpc-cl3 icon: touchpad.icon rom:touchpad.565
++ olpc-cl3 icon: touchscreen.icon rom:touchpad.565
+icon: display.icon  rom:display.565
+- olpc-cl3 icon: keyboard.icon rom:keyboard.565
+icon: timer.icon    rom:timer.565
+icon: clock.icon    rom:clock.565
+icon: ebook.icon    rom:ebook.565
+icon: leds.icon     rom:leds.565
+
++ olpc-cl3  : screen-kbd-scroller  ( -- )  blank-screen  open-screen-keyboard  ;
++ olpc-cl3  ' screen-kbd-scroller to scroller-on
++ olpc-cl3  ' close-screen-keyboard to scroller-off
+
+: cpu-item      ( -- )  " /cpu"       mfg-test-dev  ;
+: battery-item  ( -- )  " /battery"   mfg-test-dev  ;
+: spiflash-item ( -- )  " /flash"     mfg-test-dev  ;
+: memory-item   ( -- )  " /memory"    mfg-test-dev  ;
++ olpc-cl2  : usb-item   ( -- )  " /usb/hub"   mfg-test-dev  ;
++ olpc-cl3  : otg-item   ( -- )  " otg"        mfg-test-dev  ;
++ olpc-cl3  : usb-item   ( -- )  " usba"       mfg-test-dev  ;
+: int-sd-item   ( -- )  " int:0"      mfg-test-dev  ;
+- olpc-cl3 : ext-sd-item   ( -- )  " ext:0"      mfg-test-dev  ;
+: rtc-item      ( -- )  " /rtc"       mfg-test-dev  ;
+: display-item  ( -- )  " /display"   gfx-test-dev  ;
+: audio-item    ( -- )  " /audio"     mfg-test-dev  ;
+: camera-item   ( -- )  " /camera"    gfx-test-dev  ;
+: wlan-item     ( -- )  " /wlan"      mfg-test-dev  ;
+: timer-item    ( -- )  " /timer"     mfg-test-dev  ;
+- olpc-cl3 : touchpad-item ( -- )  " mouse"  mfg-test-dev  ;
++ olpc-cl3 : touchscreen-item ( -- )  " /touchscreen"  gfx-test-dev  ;
+- olpc-cl3 : keyboard-item ( -- )  " keyboard"   mfg-test-dev  ;
+: switch-item   ( -- )  " /accelerometer" mfg-test-dev  " /switches"  mfg-test-dev  ;
+: leds-item     ( -- )  " /leds"      mfg-test-dev   ;
+
+: olpc-test-menu-items  ( -- )
+   0 to #mfgtests
+   1 0 set-row-col
+
+\  " CPU"
+\  ['] cpu-item      cpu.icon      add-icon
+
+   " SPI Flash: Contains EC code, firmware, manufacturing data."
+   ['] spiflash-item  spi.icon      add-icon
+
+   " RAM chips"
+   ['] memory-item    ram.icon      add-icon
+
+   " Internal mass storage"
+   ['] int-sd-item    sdcard.icon   add-icon
+
+- olpc-cl3  " Plug-in SD card"
+- olpc-cl3  ['] ext-sd-item  sdcard.icon  add-icon
+
+   " Wireless LAN"
+   ['] wlan-item      wifi.icon     add-icon
+
+   " Display"
+   ['] display-item   display.icon  add-icon
+
+   " Camera"
+   ['] camera-item    camera.icon   add-icon
+
+   " Audio: Speaker and microphone"
+   ['] audio-item     audio.icon    add-icon
+
+   " Battery"
+   ['] battery-item   battery.icon  add-icon
+
+   " RTC (Real-Time Clock)"
+   ['] rtc-item       clock.icon    add-icon
+
++ olpc-cl2  " USB ports"
++ olpc-cl3  " USB-A port"
+   ['] usb-item       usb.icon      add-icon
+
++ olpc-cl3  " USB OTG port"
++ olpc-cl3  ['] otg-item  usb.icon  add-icon
+
+   \ These are last because they require user participation.
+   \ The earlier tests are all included in automatic batch-mode.
+
+- olpc-cl3  " Keyboard"
+- olpc-cl3  ['] keyboard-item     keyboard.icon     add-icon
+
+- olpc-cl3  " Touchpad"
+- olpc-cl3  ['] touchpad-item     touchpad.icon     add-icon
+
++ olpc-cl3  " Touchscreen"
++ olpc-cl3  ['] touchscreen-item  touchscreen.icon  add-icon
+
+   " LEDs"
+   ['] leds-item    leds.icon   add-icon
+
+   " Switches and Accelerometer"
+   ['] switch-item  ebook.icon  add-icon
+;
+' olpc-test-menu-items to test-menu-items

Modified: cpu/arm/olpc/build-fw.fth
==============================================================================
--- cpu/arm/olpc/build-fw.fth	Thu Jul 12 22:36:46 2012	(r3058)
+++ cpu/arm/olpc/build-fw.fth	Thu Jul 12 22:49:36 2012	(r3059)
@@ -794,7 +794,7 @@
 : ?text-on  ( -- )  key?  if  text-on visible  then  ;
 [then]

-fload ${BP}/cpu/arm/olpc/testitems.fth
+fload ${BP}/cpu/arm/olpc/1.75/testitems.fth

: startup  ( -- )
    standalone?  0=  if  exit  then