Author: wmb Date: Tue Sep 4 19:38:42 2012 New Revision: 3281 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3281
Log: OLPC ARM - Moved the security Processor communication protocol driver after the USB driver in the load sequence so the ambiguous pathname /keyboard will resolve to /ap-sp/keyboard instead of /usb/keyboard after a USB keyboard has been attached. Manufacturing test scripts need that behavior per OLPC trac #12074.
Modified: cpu/arm/olpc/build-fw.fth
Modified: cpu/arm/olpc/build-fw.fth ============================================================================== --- cpu/arm/olpc/build-fw.fth Tue Sep 4 19:14:17 2012 (r3280) +++ cpu/arm/olpc/build-fw.fth Tue Sep 4 19:38:42 2012 (r3281) @@ -241,12 +241,6 @@
fload ${BP}/dev/olpc/kb3700/spicmd.fth \ EC SPI Command Protocol
-[ifdef] has-sp-kbd -fload ${BP}/cpu/arm/olpc/spcmd.fth \ Security Processor communication protocol -devalias keyboard /ap-sp/keyboard -devalias mouse /ap-sp/mouse -[then] - : wlan-reset ( -- ) wlan-reset-gpio# gpio-clr d# 20 ms wlan-reset-gpio# gpio-set ;
fload ${BP}/ofw/core/fdt.fth @@ -302,6 +296,15 @@ [then] fload ${BP}/cpu/arm/olpc/usb.fth
+[ifdef] has-sp-kbd +\ Load this after the USB driver so the ambiguous pathname /keyboard will +\ resolve to /ap-sp/keyboard instead of /usb/keyboard after a USB keyboard +\ has been attached. Manufacturing test scripts need that behavior. +fload ${BP}/cpu/arm/olpc/spcmd.fth \ Security Processor communication protocol +devalias keyboard /ap-sp/keyboard +devalias mouse /ap-sp/mouse +[then] + fload ${BP}/dev/olpc/mmp2camera/loadpkg.fth
fload ${BP}/cpu/arm/firfilter.fth