openfirmware July 2012

openfirmware@openfirmware.info

1 participants
78 discussions

[commit] r3065 - cpu/arm/olpc/cl4
by repository service 13 Jul '12

13 Jul '12

Author: wmb Date: Fri Jul 13 03:40:22 2012 New Revision: 3065 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3065 Log: OLPC CL4 - fixed typo in build script. Modified: cpu/arm/olpc/cl4/fw.bth Modified: cpu/arm/olpc/cl4/fw.bth ============================================================================== --- cpu/arm/olpc/cl4/fw.bth Fri Jul 13 03:33:40 2012 (r3064) +++ cpu/arm/olpc/cl4/fw.bth Fri Jul 13 03:40:22 2012 (r3065) @@ -11,7 +11,7 @@ dev /sd new-device - 4 encode-int "reg" property + 4 encode-int " reg" property fload ${BP}/dev/mmc/sdhci/sdmmc.fth fload ${BP}/dev/mmc/sdhci/selftest.fth " internal" " slot-name" string-property

1 0

[commit] r3064 - cpu/arm/olpc cpu/arm/olpc/1.75 cpu/arm/olpc/3.0 cpu/arm/olpc/cl4 cpu/x86/pc/olpc cpu/x86/pc/olpc/via dev/olpc/spiflash
by repository service 13 Jul '12

13 Jul '12

Author: wmb Date: Fri Jul 13 03:33:40 2012 New Revision: 3064 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3064 Log: OLPC - parameterize the location of the signature string in the FLASH, now that we must deal with different FLASH sizes. Modified: cpu/arm/olpc/1.75/config.fth cpu/arm/olpc/1.75/keyject.bth cpu/arm/olpc/1.75/olpc.bth cpu/arm/olpc/3.0/config.fth cpu/arm/olpc/3.0/olpc.bth cpu/arm/olpc/build-fw.fth cpu/arm/olpc/cl4/config.fth cpu/arm/olpc/cl4/olpc.bth cpu/x86/pc/olpc/addrs.fth cpu/x86/pc/olpc/keyject.bth cpu/x86/pc/olpc/olpc.bth cpu/x86/pc/olpc/via/addrs.fth cpu/x86/pc/olpc/via/keyject.bth cpu/x86/pc/olpc/via/olpc.bth dev/olpc/spiflash/spiui.fth Modified: cpu/arm/olpc/1.75/config.fth ============================================================================== --- cpu/arm/olpc/1.75/config.fth Fri Jul 13 02:59:46 2012 (r3063) +++ cpu/arm/olpc/1.75/config.fth Fri Jul 13 03:33:40 2012 (r3064) @@ -17,6 +17,7 @@ h# e.0000 constant mfg-data-offset \ Offset to manufacturing data area in SPI FLASH h# f.0000 constant mfg-data-end-offset \ Offset to end of manufacturing data area in SPI FLASH h# f.ffd8 constant crc-offset +h# f.ffc0 constant signature-offset h# 10.0000 constant /rom \ Total size of SPI FLASH Modified: cpu/arm/olpc/1.75/keyject.bth ============================================================================== --- cpu/arm/olpc/1.75/keyject.bth Fri Jul 13 02:59:46 2012 (r3063) +++ cpu/arm/olpc/1.75/keyject.bth Fri Jul 13 03:33:40 2012 (r3064) @@ -167,12 +167,12 @@ /rom pad-file \ Insert the revision signature -/rom h# 40 - ofd @ fseek h# 10 buffer: signature signature h# 10 blank signature$ signature swap move " ${FW_VERSION}" expand$ signature 6 + swap move " ${FW_PREFIX}${FW_MAJOR}" expand$ signature d# 13 + swap move +signature-offset ofd @ fseek signature h# 10 ofd @ fputs /l buffer: crcbuf Modified: cpu/arm/olpc/1.75/olpc.bth ============================================================================== --- cpu/arm/olpc/1.75/olpc.bth Fri Jul 13 02:59:46 2012 (r3063) +++ cpu/arm/olpc/1.75/olpc.bth Fri Jul 13 03:33:40 2012 (r3064) @@ -159,12 +159,12 @@ /rom pad-file \ Insert the revision signature -/rom h# 40 - ofd @ fseek h# 10 buffer: signature signature h# 10 blank signature$ signature swap move " ${FW_VERSION}" expand$ signature 6 + swap move " ${FW_PREFIX}${FW_MAJOR}" expand$ signature d# 13 + swap move +signature-offset ofd @ fseek signature h# 10 ofd @ fputs /l buffer: crcbuf Modified: cpu/arm/olpc/3.0/config.fth ============================================================================== --- cpu/arm/olpc/3.0/config.fth Fri Jul 13 02:59:46 2012 (r3063) +++ cpu/arm/olpc/3.0/config.fth Fri Jul 13 03:33:40 2012 (r3064) @@ -16,6 +16,7 @@ h# e.0000 constant mfg-data-offset \ Offset to manufacturing data area in SPI FLASH h# f.0000 constant mfg-data-end-offset \ Offset to end of manufacturing data area in SPI FLASH h# f.ffd8 constant crc-offset +h# f.ffc0 constant signature-offset h# 10.0000 constant /rom \ Total size of SPI FLASH Modified: cpu/arm/olpc/3.0/olpc.bth ============================================================================== --- cpu/arm/olpc/3.0/olpc.bth Fri Jul 13 02:59:46 2012 (r3063) +++ cpu/arm/olpc/3.0/olpc.bth Fri Jul 13 03:33:40 2012 (r3064) @@ -162,12 +162,12 @@ /rom pad-file \ Insert the revision signature -/rom h# 40 - ofd @ fseek h# 10 buffer: signature signature h# 10 blank signature$ signature swap move " ${FW_VERSION}" expand$ signature 6 + swap move " ${FW_PREFIX}${FW_MAJOR}" expand$ signature d# 13 + swap move +signature-offset ofd @ fseek signature h# 10 ofd @ fputs /l buffer: crcbuf Modified: cpu/arm/olpc/build-fw.fth ============================================================================== --- cpu/arm/olpc/build-fw.fth Fri Jul 13 02:59:46 2012 (r3063) +++ cpu/arm/olpc/build-fw.fth Fri Jul 13 03:33:40 2012 (r3064) @@ -327,7 +327,7 @@ dend " /openprom" find-device - flash-open pad d# 16 2dup h# fffc0 flash-read ( adr len ) + flash-open pad d# 16 2dup signature-offset flash-read ( adr len ) " model" string-property " sourceurl" find-drop-in if " source-url" string-property then Modified: cpu/arm/olpc/cl4/config.fth ============================================================================== --- cpu/arm/olpc/cl4/config.fth Fri Jul 13 02:59:46 2012 (r3063) +++ cpu/arm/olpc/cl4/config.fth Fri Jul 13 03:33:40 2012 (r3064) @@ -11,8 +11,9 @@ fload ${BP}/cpu/arm/olpc/addrs.fth h# 1f.0000 constant mfg-data-offset \ Offset to manufacturing data area in SPI FLASH -h# 10.0000 constant mfg-data-end-offset \ Offset to end of manufacturing data area in SPI FLASH -h# 1e.ffd8 constant crc-offset +h# 20.0000 constant mfg-data-end-offset \ Offset to end of manufacturing data area in SPI FLASH +h# 1e.ffd0 constant crc-offset +h# 1e.ffc0 constant signature-offset h# 20.0000 constant /rom \ Total size of SPI FLASH Modified: cpu/arm/olpc/cl4/olpc.bth ============================================================================== --- cpu/arm/olpc/cl4/olpc.bth Fri Jul 13 02:59:46 2012 (r3063) +++ cpu/arm/olpc/cl4/olpc.bth Fri Jul 13 03:33:40 2012 (r3064) @@ -163,18 +163,18 @@ /rom pad-file \ Insert the revision signature -/rom h# 40 - ofd @ fseek h# 10 buffer: signature signature h# 10 blank signature$ signature swap move " ${FW_VERSION}" expand$ signature 6 + swap move " ${FW_PREFIX}${FW_MAJOR}" expand$ signature d# 13 + swap move +signature-offset ofd @ fseek signature h# 10 ofd @ fputs /l buffer: crcbuf /rom buffer: filebuf -\ Read the entire image, compute the CRC, and store it h# 28 from the end +\ Read the entire image, compute the CRC, and store it in the CRC location 0 ofd @ fseek filebuf /rom ofd @ fgets /rom <> abort" Can't read back image" 0 crctab filebuf /rom ($crc) crcbuf ! Modified: cpu/x86/pc/olpc/addrs.fth ============================================================================== --- cpu/x86/pc/olpc/addrs.fth Fri Jul 13 02:59:46 2012 (r3063) +++ cpu/x86/pc/olpc/addrs.fth Fri Jul 13 03:33:40 2012 (r3064) @@ -78,6 +78,7 @@ h# e.0000 constant mfg-data-offset \ Offset to manufacturing data area in SPI FLASH h# f.0000 constant mfg-data-end-offset \ Offset to end of manufacturing data area in SPI FLASH h# f.ffd0 constant crc-offset +h# f.ffc0 constant signature-offset fload ${BP}/cpu/x86/pc/virtaddr.fth [ifndef] virtual-mode Modified: cpu/x86/pc/olpc/keyject.bth ============================================================================== --- cpu/x86/pc/olpc/keyject.bth Fri Jul 13 02:59:46 2012 (r3063) +++ cpu/x86/pc/olpc/keyject.bth Fri Jul 13 03:33:40 2012 (r3064) @@ -115,12 +115,12 @@ " rmstart.img" $add-file \ Insert the revision signature -/rom h# 40 - ofd @ fseek h# 10 buffer: signature signature h# 10 blank machine-signature count signature swap move " ${FW_VERSION}" expand$ signature 6 + swap move " Q2${FW_MAJOR}" expand$ signature d# 13 + swap move +signature-offset ofd @ fseek signature h# 10 ofd @ fputs /l buffer: crcbuf Modified: cpu/x86/pc/olpc/olpc.bth ============================================================================== --- cpu/x86/pc/olpc/olpc.bth Fri Jul 13 02:59:46 2012 (r3063) +++ cpu/x86/pc/olpc/olpc.bth Fri Jul 13 03:33:40 2012 (r3064) @@ -107,12 +107,12 @@ " rmstart.img" $add-file \ Insert the revision signature -/rom h# 40 - ofd @ fseek h# 10 buffer: signature signature h# 10 blank machine-signature count signature swap move " ${FW_VERSION}" expand$ signature 6 + swap move " Q2${FW_MAJOR}" expand$ signature d# 13 + swap move +signature-offset ofd @ fseek signature h# 10 ofd @ fputs /l buffer: crcbuf Modified: cpu/x86/pc/olpc/via/addrs.fth ============================================================================== --- cpu/x86/pc/olpc/via/addrs.fth Fri Jul 13 02:59:46 2012 (r3063) +++ cpu/x86/pc/olpc/via/addrs.fth Fri Jul 13 03:33:40 2012 (r3064) @@ -111,6 +111,7 @@ h# e.0000 constant mfg-data-offset \ Offset to manufacturing data area in SPI FLASH h# f.0000 constant mfg-data-end-offset \ Offset to end of manufacturing data area in SPI FLASH h# f.ffd4 constant crc-offset +h# f.ffc0 constant signature-offset fload ${BP}/cpu/x86/pc/virtaddr.fth Modified: cpu/x86/pc/olpc/via/keyject.bth ============================================================================== --- cpu/x86/pc/olpc/via/keyject.bth Fri Jul 13 02:59:46 2012 (r3063) +++ cpu/x86/pc/olpc/via/keyject.bth Fri Jul 13 03:33:40 2012 (r3064) @@ -212,12 +212,12 @@ " rmstart.img" $add-file \ Insert the revision signature -/rom h# 40 - ofd @ fseek h# 10 buffer: signature signature h# 10 blank machine-signature count signature swap move " ${FW_VERSION}" expand$ signature 6 + swap move " Q3${FW_MAJOR}" expand$ signature d# 13 + swap move +signature-offset ofd @ fseek signature h# 10 ofd @ fputs create sipbuf Modified: cpu/x86/pc/olpc/via/olpc.bth ============================================================================== --- cpu/x86/pc/olpc/via/olpc.bth Fri Jul 13 02:59:46 2012 (r3063) +++ cpu/x86/pc/olpc/via/olpc.bth Fri Jul 13 03:33:40 2012 (r3064) @@ -204,12 +204,12 @@ " rmstart.img" $add-file \ Insert the revision signature -/rom h# 40 - ofd @ fseek h# 10 buffer: signature signature h# 10 blank machine-signature count signature swap move " ${FW_VERSION}" expand$ signature 6 + swap move " Q3${FW_MAJOR}" expand$ signature d# 13 + swap move +signature-offset ofd @ fseek signature h# 10 ofd @ fputs create sipbuf Modified: dev/olpc/spiflash/spiui.fth ============================================================================== --- dev/olpc/spiflash/spiui.fth Fri Jul 13 02:59:46 2012 (r3063) +++ dev/olpc/spiflash/spiui.fth Fri Jul 13 03:33:40 2012 (r3064) @@ -73,7 +73,7 @@ /flash <> abort" Image file is the wrong length" ." Got firmware version: " - flash-buf h# f.ffc0 + dup h# 10 type cr ( adr ) + flash-buf signature-offset + dup h# 10 type cr ( adr ) signature$ comp abort" Wrong machine signature" ?crc

1 0

[commit] r3063 - cpu/arm/olpc/cl4
by repository service 13 Jul '12

13 Jul '12

Author: wmb Date: Fri Jul 13 02:59:46 2012 New Revision: 3063 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3063 Log: OLPC CL4 - FW_PREFIX is Q6 Modified: cpu/arm/olpc/cl4/fw-version.fth Modified: cpu/arm/olpc/cl4/fw-version.fth ============================================================================== --- cpu/arm/olpc/cl4/fw-version.fth Thu Jul 12 23:24:19 2012 (r3062) +++ cpu/arm/olpc/cl4/fw-version.fth Fri Jul 13 02:59:46 2012 (r3063) @@ -1,4 +1,4 @@ \ The overall firmware revision -macro: FW_PREFIX Q5 +macro: FW_PREFIX Q6 macro: FW_MAJOR A macro: FW_MINOR 00ma

1 0

[commit] r3062 - dev/olpc/mmp2camera
by repository service 12 Jul '12

12 Jul '12

Author: wmb Date: Thu Jul 12 23:24:19 2012 New Revision: 3062 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3062 Log: OLPC ARM - don't touch cam-pwrdn GPIO on platforms that don't have it. (CL4 now builds cleanly) Modified: dev/olpc/mmp2camera/platform.fth Modified: dev/olpc/mmp2camera/platform.fth ============================================================================== --- dev/olpc/mmp2camera/platform.fth Thu Jul 12 23:03:07 2012 (r3061) +++ dev/olpc/mmp2camera/platform.fth Thu Jul 12 23:24:19 2012 (r3062) @@ -21,10 +21,14 @@ : sensor-power-on ( -- ) cam-pwr-gpio# gpio-set +[ifdef] cam-pwrdn-gpio# cam-pwrdn-gpio# gpio-clr +[then] ; : sensor-power-off ( -- ) +[ifdef] cam-pwrdn-gpio# ( cam-pwrdn-gpio# gpio-set ) \ Leave low for Linux +[then] cam-pwr-gpio# gpio-clr ; [then]

1 0

[commit] r3061 - cpu/arm/olpc
by repository service 12 Jul '12

12 Jul '12

Author: wmb Date: Thu Jul 12 23:03:07 2012 New Revision: 3061 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3061 Log: OLPC ARM - removed dead commented-out line from lcd.fth Modified: cpu/arm/olpc/lcd.fth Modified: cpu/arm/olpc/lcd.fth ============================================================================== --- cpu/arm/olpc/lcd.fth Thu Jul 12 23:02:13 2012 (r3060) +++ cpu/arm/olpc/lcd.fth Thu Jul 12 23:03:07 2012 (r3061) @@ -42,8 +42,6 @@ alias depth bpp width >bytes constant /scanline -\ \+ olpc-cl3 fload ${BP}/cpu/arm/olpc/3.0/lcdcfg.fth - : lcd@ ( offset -- l ) lcd-pa + io@ ; : lcd! ( l offset -- ) lcd-pa + io! ;

1 0

[commit] r3060 - in cpu/arm/olpc: . 1.75 3.0 cl4
by repository service 12 Jul '12

12 Jul '12

Author: wmb Date: Thu Jul 12 23:02:13 2012 New Revision: 3060 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3060 Log: OLPC ARM - split previously-ifdef'ed testitems.fth file into per-platform non-ifdef'ed versions. Added: cpu/arm/olpc/3.0/testitems.fth cpu/arm/olpc/cl4/testitems.fth Modified: cpu/arm/olpc/1.75/fw.bth cpu/arm/olpc/1.75/testitems.fth cpu/arm/olpc/3.0/fw.bth cpu/arm/olpc/build-fw.fth cpu/arm/olpc/cl4/fw.bth Modified: cpu/arm/olpc/1.75/fw.bth ============================================================================== --- cpu/arm/olpc/1.75/fw.bth Thu Jul 12 22:49:36 2012 (r3059) +++ cpu/arm/olpc/1.75/fw.bth Thu Jul 12 23:02:13 2012 (r3060) @@ -39,6 +39,7 @@ fload ${BP}/cpu/arm/olpc/1.75/compass.fth fload ${BP}/cpu/arm/olpc/1.75/switches.fth fload ${BP}/cpu/arm/olpc/1.75/leds.fth +fload ${BP}/cpu/arm/olpc/1.75/testitems.fth fload ${BP}/cpu/arm/olpc/1.75/testinstructions.fth fload ${BP}/cpu/arm/olpc/gpio-gamekeys.fth fload ${BP}/cpu/arm/olpc/test-tweaks.fth Modified: cpu/arm/olpc/1.75/testitems.fth ============================================================================== --- cpu/arm/olpc/1.75/testitems.fth Thu Jul 12 22:49:36 2012 (r3059) +++ cpu/arm/olpc/1.75/testitems.fth Thu Jul 12 23:02:13 2012 (r3060) @@ -12,37 +12,30 @@ 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: touchpad.icon rom:touchpad.565 icon: display.icon rom:display.565 -\- olpc-cl3 icon: keyboard.icon rom:keyboard.565 +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 ; +: usb-item ( -- ) " /usb/hub" mfg-test-dev ; : int-sd-item ( -- ) " int:0" mfg-test-dev ; -\- olpc-cl3 : ext-sd-item ( -- ) " ext:0" mfg-test-dev ; +: 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 ; +: touchpad-item ( -- ) " mouse" mfg-test-dev ; +: keyboard-item ( -- ) " keyboard" mfg-test-dev ; : switch-item ( -- ) " /accelerometer" mfg-test-dev " /switches" mfg-test-dev ; : leds-item ( -- ) " /leds" mfg-test-dev ; @@ -62,8 +55,8 @@ " 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 + " Plug-in SD card" + ['] ext-sd-item sdcard.icon add-icon " Wireless LAN" ['] wlan-item wifi.icon add-icon @@ -83,24 +76,19 @@ " RTC (Real-Time Clock)" ['] rtc-item clock.icon add-icon -\+ olpc-cl2 " USB ports" -\+ olpc-cl3 " USB-A port" + " USB ports" ['] 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 + " Keyboard" + ['] keyboard-item keyboard.icon add-icon -\- olpc-cl3 " Touchpad" -\- olpc-cl3 ['] touchpad-item touchpad.icon add-icon + " Touchpad" + ['] touchpad-item touchpad.icon add-icon -\+ olpc-cl3 " Touchscreen" -\+ olpc-cl3 ['] touchscreen-item touchscreen.icon add-icon " LEDs" ['] leds-item leds.icon add-icon Modified: cpu/arm/olpc/3.0/fw.bth ============================================================================== --- cpu/arm/olpc/3.0/fw.bth Thu Jul 12 22:49:36 2012 (r3059) +++ cpu/arm/olpc/3.0/fw.bth Thu Jul 12 23:02:13 2012 (r3060) @@ -17,6 +17,7 @@ fload ${BP}/cpu/arm/olpc/exc7200-touchscreen.fth fload ${BP}/cpu/arm/olpc/3.0/switches.fth fload ${BP}/cpu/arm/olpc/3.0/leds.fth +fload ${BP}/cpu/arm/olpc/3.0/testitems.fth fload ${BP}/cpu/arm/olpc/3.0/testinstructions.fth fload ${BP}/cpu/arm/olpc/test-tweaks.fth Added: cpu/arm/olpc/3.0/testitems.fth ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ cpu/arm/olpc/3.0/testitems.fth Thu Jul 12 23:02:13 2012 (r3060) @@ -0,0 +1,96 @@ +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 +icon: touchscreen.icon rom:touchpad.565 +icon: display.icon rom:display.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 + +: screen-kbd-scroller ( -- ) blank-screen open-screen-keyboard ; +' screen-kbd-scroller to scroller-on +' 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 ; +: otg-item ( -- ) " otg" mfg-test-dev ; +: usb-item ( -- ) " usba" mfg-test-dev ; +: int-sd-item ( -- ) " int: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 ; +: touchscreen-item ( -- ) " /touchscreen" gfx-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 + + + " 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 + + " USB-A port" + ['] usb-item usb.icon add-icon + + " USB OTG port" + ['] otg-item usb.icon add-icon + + \ These are last because they require user participation. + \ The earlier tests are all included in automatic batch-mode. + + " Touchscreen" + ['] 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:49:36 2012 (r3059) +++ cpu/arm/olpc/build-fw.fth Thu Jul 12 23:02:13 2012 (r3060) @@ -794,8 +794,6 @@ : ?text-on ( -- ) key? if text-on visible then ; [then] -fload ${BP}/cpu/arm/olpc/1.75/testitems.fth - : startup ( -- ) standalone? 0= if exit then Modified: cpu/arm/olpc/cl4/fw.bth ============================================================================== --- cpu/arm/olpc/cl4/fw.bth Thu Jul 12 22:49:36 2012 (r3059) +++ cpu/arm/olpc/cl4/fw.bth Thu Jul 12 23:02:13 2012 (r3060) @@ -34,6 +34,7 @@ fload ${BP}/cpu/arm/olpc/nn-touchscreen.fth fload ${BP}/cpu/arm/olpc/cl4/switches.fth fload ${BP}/cpu/arm/olpc/cl4/leds.fth +fload ${BP}/cpu/arm/olpc/cl4/testitems.fth fload ${BP}/cpu/arm/olpc/cl4/testinstructions.fth fload ${BP}/cpu/arm/olpc/gpio-gamekeys.fth fload ${BP}/cpu/arm/olpc/test-tweaks.fth Added: cpu/arm/olpc/cl4/testitems.fth ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ cpu/arm/olpc/cl4/testitems.fth Thu Jul 12 23:02:13 2012 (r3060) @@ -0,0 +1,99 @@ +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 +icon: touchpad.icon rom:touchpad.565 +icon: display.icon rom:display.565 +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 + + +: cpu-item ( -- ) " /cpu" mfg-test-dev ; +: battery-item ( -- ) " /battery" mfg-test-dev ; +: spiflash-item ( -- ) " /flash" mfg-test-dev ; +: memory-item ( -- ) " /memory" mfg-test-dev ; +: usb-item ( -- ) " /usb/hub" mfg-test-dev ; +: int-sd-item ( -- ) " int:0" mfg-test-dev ; +: 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 ; +: touchpad-item ( -- ) " mouse" mfg-test-dev ; +: 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 + + " Plug-in SD card" + ['] 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 + + " USB ports" + ['] usb-item usb.icon add-icon + + + \ These are last because they require user participation. + \ The earlier tests are all included in automatic batch-mode. + + " Keyboard" + ['] keyboard-item keyboard.icon add-icon + + " Touchpad" + ['] touchpad-item touchpad.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

1 0

[commit] r3059 - in cpu/arm/olpc: . 1.75
by repository service 12 Jul '12

12 Jul '12

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

1 0

[commit] r3058 - in cpu/x86/pc/olpc: . via
by repository service 12 Jul '12

12 Jul '12

Author: wmb Date: Thu Jul 12 22:36:46 2012 New Revision: 3058 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3058 Log: OLPC - synchronized keyjector.bth templates with latest olpc.bth files. Modified: cpu/x86/pc/olpc/keyject.bth cpu/x86/pc/olpc/via/keyject.bth Modified: cpu/x86/pc/olpc/keyject.bth ============================================================================== --- cpu/x86/pc/olpc/keyject.bth Thu Jul 12 22:35:00 2012 (r3057) +++ cpu/x86/pc/olpc/keyject.bth Thu Jul 12 22:36:46 2012 (r3058) @@ -19,6 +19,7 @@ in: ${BP}/dev/usb2/device/serial/build/usbserial.fc in: ${BP}/dev/usb2/device/storage/build/usbstorage.fc in: ${BP}/dev/usb2/device/keyboard/build/usbkbd.fc +in: ${BP}/dev/usb2/device/mouse/build/usbmouse.fc in: ${BP}/dev/usb2/device/wlan/build/usb8388.fc in: ${BP}/dev/olpc/cafenand/build/cafenand.fc in: ${BP}/dev/olpc/cafecamera/build/cafecamera.fc @@ -29,6 +30,7 @@ in: ${BP}/dev/pci/build/pcibridg.fc in: ${BP}/cpu/x86/pc/olpc/build/dsdt.aml in: ${BP}/cpu/x86/pc/olpc/build/mcastnand.bin +in: testicons.bin build-now @@ -54,6 +56,10 @@ ?do h# ff ofd @ fputc loop ; +\ Tell the dropin manager to skip the area reserved for manufacturing data +h# e0000 to reserved-start +h# f0000 to reserved-end + .( --- Saving as ) " ${FW_VERSION}.rom" expand$ 2dup lower ( adr len ) 2dup type cr ( adr len ) @@ -81,6 +87,22 @@ \ " ${BP}/cpu/x86/pc/olpc/build/multicast-nand/mcastnand.elf" " mcastnand" $add-deflated-dropin \ " ${BP}/cpu/x86/pc/olpc/build/blaster.bin" " blaster" $add-deflated-dropin \ " ${BP}/cpu/x86/pc/olpc/build/cloner.bin" " cloner" $add-deflated-dropin + " testicons/play.565" " play.565" $add-deflated-dropin + " testicons/quit.565" " quit.565" $add-deflated-dropin + " testicons/cpu.565" " cpu.565" $add-deflated-dropin + " testicons/spi.565" " spi.565" $add-deflated-dropin + " testicons/ram.565" " ram.565" $add-deflated-dropin + " testicons/sdcard.565" " sdcard.565" $add-deflated-dropin + " testicons/keyboard.565" " keyboard.565" $add-deflated-dropin + " testicons/display.565" " display.565" $add-deflated-dropin + " testicons/touchpad.565" " touchpad.565" $add-deflated-dropin + " testicons/audio.565" " audio.565" $add-deflated-dropin + " testicons/usb.565" " usb.565" $add-deflated-dropin + " testicons/battery.565" " battery.565" $add-deflated-dropin + " testicons/camera.565" " camera.565" $add-deflated-dropin + " testicons/wifi.565" " wifi.565" $add-deflated-dropin + " testicons/clock.565" " clock.565" $add-deflated-dropin + " testicons/timer.565" " timer.565" $add-deflated-dropin " ${BP}/cpu/x86/pc/olpc/keyject.fth" " probe+" $add-deflated-dropin " /space/bios-crypto/build/k2.public" " o1" $add-dropin \ Incompressible @@ -96,7 +118,7 @@ /rom h# 40 - ofd @ fseek h# 10 buffer: signature signature h# 10 blank -" CL1" signature swap move +machine-signature count signature swap move " ${FW_VERSION}" expand$ signature 6 + swap move " Q2${FW_MAJOR}" expand$ signature d# 13 + swap move signature h# 10 ofd @ fputs Modified: cpu/x86/pc/olpc/via/keyject.bth ============================================================================== --- cpu/x86/pc/olpc/via/keyject.bth Thu Jul 12 22:35:00 2012 (r3057) +++ cpu/x86/pc/olpc/via/keyject.bth Thu Jul 12 22:36:46 2012 (r3058) @@ -20,6 +20,7 @@ in: ${BP}/dev/usb2/device/serial/build/usbserial.fc in: ${BP}/dev/usb2/device/storage/build/usbstorage.fc in: ${BP}/dev/usb2/device/keyboard/build/usbkbd.fc +in: ${BP}/dev/usb2/device/mouse/build/usbmouse.fc in: ${BP}/clients/memtest86/memtest in: ${BP}/clients/emacs/x86/emacs in: ${BP}/cpu/x86/pc/olpc/via/build/verify.img @@ -60,6 +61,10 @@ ?do h# ff ofd @ fputc loop ; +\ Tell the dropin manager to skip the area reserved for manufacturing data +h# e0000 to reserved-start +h# f0000 to reserved-end + .( --- Saving as ) " ${FW_VERSION}.rom" expand$ 2dup lower ( adr len ) 2dup type cr ( adr len ) @@ -70,12 +75,7 @@ dropin-base rom-pa - pad-file -[ifdef] coreboot-loaded - " romstart.di" $add-file -[else] " romreset.di" $add-file -[then] - " resume.di" $add-file \ Loads the set of drivers that is common to different output formats @@ -90,7 +90,8 @@ " ${BP}/dev/usb2/device/hub/build/hub.fc" " usb,class9" $add-dropin " ${BP}/dev/usb2/device/generic/build/generic.fc" " usbdevice" $add-deflated-dropin " ${BP}/dev/usb2/device/net/build/usbnet.fc" " usbnet" $add-deflated-dropin - " ${BP}/dev/usb2/device/keyboard/build/usbkbd.fc" " usb,class3,1" $add-dropin + " ${BP}/dev/usb2/device/keyboard/build/usbkbd.fc" " usb,class3,1,1" $add-deflated-dropin + " ${BP}/dev/usb2/device/mouse/build/usbmouse.fc" " usb,class3,1,2" $add-deflated-dropin " ${BP}/dev/usb2/device/serial/build/usbserial.fc" " usbserial" $add-deflated-dropin " ${BP}/dev/usb2/device/storage/build/usbstorage.fc" " usbstorage" $add-deflated-dropin \ " mrv8686.bin" " mrv8686.bin" $add-deflated-dropin @@ -162,8 +163,9 @@ " ${BP}/cpu/x86/pc/olpc/images/Edge1-8k-EQ-Comp-Amp-Short.wav" " splash" $add-deflated-dropin - " ${BP}/cpu/x86/pc/olpc/via/build/dsdt.aml" " dsdt" $add-deflated-dropin -\ " ${BP}/cpu/x86/pc/olpc/via/build/ssdt.aml" " ssdt" $add-deflated-dropin + " ${BP}/cpu/x86/pc/olpc/via/build/dsdt.aml" " dsdt" $add-deflated-dropin + " ${BP}/cpu/x86/pc/olpc/via/build/dsdt-c2only.aml" " dsdt-c2only" $add-deflated-dropin +\ " ${BP}/cpu/x86/pc/olpc/via/build/ssdt.aml" " ssdt" $add-deflated-dropin \ icons for mfg test gui " testicons/play.565" " play.565" $add-deflated-dropin @@ -190,6 +192,10 @@ " ${BP}/cpu/x86/pc/olpc/via/build/nandblaster15_rx.bin" " nb15_rx" $add-deflated-dropin " ${BP}/cpu/x86/pc/olpc/via/build/nandblaster_tx.bin" " nb_tx" $add-deflated-dropin + " ${BP}/cpu/x86/pc/olpc/images/winlogo.565" " winlogo.565" $add-deflated-dropin + " ${BP}/cpu/x86/pc/olpc/images/tux.565" " tux.565" $add-deflated-dropin + " ${BP}/cpu/x86/pc/olpc/images/settings.565" " settings.565" $add-deflated-dropin + " ${BP}/cpu/x86/pc/olpc/keyject.fth" " probe+" $add-deflated-dropin " /space/bios-crypto/build/k2.public" " o1" $add-dropin \ Incompressible " /space/bios-crypto/build/k2.public" " s1" $add-dropin @@ -199,11 +205,7 @@ .( Dropin top is ) ofd @ fsize .x cr -[ifdef] coreboot-loaded - /rom h# 10000 - pad-file \ coreboot init image must be in last FLASH block - " coreboot.img" $add-file -[else] - /rom h# 10000 - pad-file \ coreboot init image must be in last FLASH block +\ /rom h# 10000 - pad-file \ coreboot init image must be in last FLASH block \ " cforth.img" $add-file \ Small Forth that runs from cache /rom h# 400 - pad-file \ rmstart image must start 0x400 from end @@ -213,7 +215,7 @@ /rom h# 40 - ofd @ fseek h# 10 buffer: signature signature h# 10 blank -" CL1" signature swap move +machine-signature count signature swap move " ${FW_VERSION}" expand$ signature 6 + swap move " Q3${FW_MAJOR}" expand$ signature d# 13 + swap move signature h# 10 ofd @ fputs @@ -245,7 +247,6 @@ /rom h# 2c - ofd @ fseek crcbuf /l ofd @ fputs -[then] ofd @ fclose

1 0

[commit] r3057 - in cpu/arm/olpc: . 1.75 3.0 cl4
by repository service 12 Jul '12

12 Jul '12

Author: wmb Date: Thu Jul 12 22:35:00 2012 New Revision: 3057 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3057 Log: OLPC ARM - Moved ec-platform$ from ecflash.fth to */config.fth Modified: cpu/arm/olpc/1.75/config.fth cpu/arm/olpc/3.0/config.fth cpu/arm/olpc/cl4/config.fth cpu/arm/olpc/ecflash.fth Modified: cpu/arm/olpc/1.75/config.fth ============================================================================== --- cpu/arm/olpc/1.75/config.fth Thu Jul 12 22:27:38 2012 (r3056) +++ cpu/arm/olpc/1.75/config.fth Thu Jul 12 22:35:00 2012 (r3057) @@ -23,6 +23,7 @@ : signature$ " CL2" ; : model$ " olpc,XO-1.75" ; : compatible$ " olpc,xo-1.75" ; +: ec-platform$ ( -- adr len ) " 4" ; d# 9999 constant machine-type \ Backwards compatibility with non-device-tree kernel Modified: cpu/arm/olpc/3.0/config.fth ============================================================================== --- cpu/arm/olpc/3.0/config.fth Thu Jul 12 22:27:38 2012 (r3056) +++ cpu/arm/olpc/3.0/config.fth Thu Jul 12 22:35:00 2012 (r3057) @@ -22,6 +22,7 @@ : signature$ " CL3" ; : model$ " olpcXO-3.0" ; : compatible$ " olpcxo-3.0" ; +: ec-platform$ ( -- adr len ) " 5" ; d# 10000 constant machine-type \ Backwards compatibility with non-device-tree kernel Modified: cpu/arm/olpc/cl4/config.fth ============================================================================== --- cpu/arm/olpc/cl4/config.fth Thu Jul 12 22:27:38 2012 (r3056) +++ cpu/arm/olpc/cl4/config.fth Thu Jul 12 22:35:00 2012 (r3057) @@ -19,6 +19,7 @@ : signature$ " CL4" ; : model$ " olpc,XO-CL4" ; : compatible$ " olpc,xo-cl4" ; +: ec-platform$ ( -- adr len ) " 6" ; d# 10001 constant machine-type \ Backwards compatibility with non-device-tree kernel Modified: cpu/arm/olpc/ecflash.fth ============================================================================== --- cpu/arm/olpc/ecflash.fth Thu Jul 12 22:27:38 2012 (r3056) +++ cpu/arm/olpc/ecflash.fth Thu Jul 12 22:35:00 2012 (r3057) @@ -87,8 +87,6 @@ load-base /ec-flash ofd @ fputs ofd @ fclose ; -\+ olpc-cl2 : ec-platform$ ( -- adr len ) " 4" ; -\+ olpc-cl3 : ec-platform$ ( -- adr len ) " 5" ; : ec-up-to-date? ( img$ -- flag ) \ If the new image has an invalid length, the old one is considered up to date dup /ec-flash <> if @@ -100,7 +98,11 @@ bl left-parse-string " XO-EC" $= 0= if 2drop true exit then ( version&date$ ) bl left-parse-string ec-platform$ $= 0= if 2drop true exit then ( version&date$ ) bl left-parse-string 2nip ( version$ ) - ec-name$ $caps-compare 0<= ( flag ) + ['] ec-name$ catch if ( version$ ) + 2drop ." Can't get EC name" cr true ( flag ) + else ( version$ ec-name$ ) + $caps-compare 0<= ( flag ) + then ( flag ) ; : update-ec-flash ( -- )

1 0

[commit] r3056 - cpu/arm/olpc/cl4/build
by repository service 12 Jul '12

12 Jul '12

Author: wmb Date: Thu Jul 12 22:27:38 2012 New Revision: 3056 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3056 Log: OLPC ARM - Initial revisions of CL4 support - build directory. Added: cpu/arm/olpc/cl4/build/ cpu/arm/olpc/cl4/build/Makefile Added: cpu/arm/olpc/cl4/build/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ cpu/arm/olpc/cl4/build/Makefile Thu Jul 12 22:27:38 2012 (r3056) @@ -0,0 +1,70 @@ +ROMNAME=olpc + +BASEDIR= `(cd ../../../../..; pwd;)` + +OS := $(shell uname) +HOSTCPU= $(shell ${BASEDIR}/forth/lib/hostcpu.sh) +HOSTDIR= ../../../../${HOSTCPU}/${OS} +BUILDSH= ${BASEDIR}/forth/lib/build.sh + +TAGFILES= ../../../build/*.tag *.tag +CLIENTDIR=../../../../../clients +CLIENTPROGS=${CLIENTDIR}/emacs/arm/emacs + +all: ${ROMNAME}.rom tags + +${ROMNAME}.tag: ${ROMNAME}.rom + +tags: ${ROMNAME}.tag + @${BASEDIR}/forth/lib/toctags ${BASEDIR} ${TAGFILES} + +${ROMNAME}.rom: FORCE build ${CLIENTPROGS} ${HOSTDIR}/forth ${HOSTDIR}/armforth + ./build $@ + +${HOSTDIR}/forth: + @make -C ${HOSTDIR} forth + +${HOSTDIR}/armforth: + @make -C ${HOSTDIR} armforth + +../../build/inflate.bin: + @make -C ../../build inflate.bin + +${CLIENTDIR}/emacs/arm/emacs: + @make -C ${CLIENTDIR}/emacs/arm emacs + +build: + @ln -sf ${BUILDSH} build + +clean: + rm -f *.dic *.log headers *~ *.elf *.di *.img builton.fth build *.rom *.version tags *.tag + +clean-all: clean + @make -C ../../build clean + @make -C ${HOSTDIR} clean + +.PHONY: FORCE clean all clean-all + +# LICENSE_BEGIN +# Copyright (c) 2009 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

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

openfirmware July 2012