Author: wmb Date: Tue Jul 3 07:21:48 2012 New Revision: 3028 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3028
Log: OLPC XO-1.75 build - rearranged the order of dropin modules as a stopgap measure to fix the build. Space is getting short.
Modified: cpu/arm/olpc/1.75/olpc.bth
Modified: cpu/arm/olpc/1.75/olpc.bth ============================================================================== --- cpu/arm/olpc/1.75/olpc.bth Sat Jun 30 01:42:38 2012 (r3027) +++ cpu/arm/olpc/1.75/olpc.bth Tue Jul 3 07:21:48 2012 (r3028) @@ -60,6 +60,8 @@ h# e.0000 to reserved-start h# f.0000 to reserved-end
+: $add-deflated-dropin 2dup type ." - " $add-deflated-dropin ofd @ fsize .x cr ; + .( --- Saving as ) " ${FW_VERSION}.rom" expand$ 2dup lower ( adr len ) 2dup type cr ( adr len ) @@ -75,59 +77,23 @@ \ " fw.img" " firmware" $add-dropin " resetvec.img" " reset" $add-dropin
-\ " ${BP}/dev/usb2/hcd/ehci/build/ehci.fc" " class0c0320" $add-deflated-dropin - " ${BP}/dev/usb2/device/hub/build/hub.fc" " usb,class9" $add-deflated-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,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 - " sd8686_helper.bin" " helper_sd.bin" $add-deflated-dropin " sd8686.bin" " sd8686.bin" $add-deflated-dropin
- " builton.fth" " probe-" $add-dropin - -0 [if] - " ${BP}/clients/emacs/x86/emacs" " emacs" $add-deflated-dropin - " ${BP}/clients/emacs/x86/emacs.rc" " emacs.rc" $add-deflated-dropin - " ${BP}/clients/emacs/emacs.hlp" " emacs.hlp" $add-deflated-dropin -[then] - - " ${BP}/ofw/inet/telnetd.fth" " telnetd" $add-deflated-dropin - -\ " ${BP}/cpu/x86/pc/olpc/images/warnings.565" " warnings.565" $add-deflated-dropin - " ${BP}/cpu/x86/pc/olpc/images/lightdot.565" " lightdot.565" $add-deflated-dropin - " ${BP}/cpu/x86/pc/olpc/images/yellowdot.565" " yellowdot.565" $add-deflated-dropin - " ${BP}/cpu/x86/pc/olpc/images/darkdot.565" " darkdot.565" $add-deflated-dropin - " ${BP}/cpu/x86/pc/olpc/images/lock.565" " lock.565" $add-deflated-dropin - " ${BP}/cpu/x86/pc/olpc/images/unlock.565" " unlock.565" $add-deflated-dropin - " ${BP}/cpu/x86/pc/olpc/images/plus.565" " plus.565" $add-deflated-dropin - " ${BP}/cpu/x86/pc/olpc/images/minus.565" " minus.565" $add-deflated-dropin - " ${BP}/cpu/x86/pc/olpc/images/x.565" " x.565" $add-deflated-dropin - " ${BP}/cpu/x86/pc/olpc/images/sad.565" " sad.565" $add-deflated-dropin - " ${BP}/cpu/x86/pc/olpc/images/bigdot.565" " bigdot.565" $add-deflated-dropin - - " ${BP}/cpu/x86/pc/olpc/images/check.565" " check.565" $add-deflated-dropin - " ${BP}/cpu/x86/pc/olpc/images/xogray.565" " xogray.565" $add-deflated-dropin - " ${BP}/cpu/x86/pc/olpc/images/ethernet.565" " ethernet.565" $add-deflated-dropin - " ${BP}/cpu/x86/pc/olpc/images/usbkey.565" " disk.565" $add-deflated-dropin - " ${BP}/cpu/x86/pc/olpc/images/wireless.565" " wlan.565" $add-deflated-dropin - " ${BP}/cpu/x86/pc/olpc/images/laptop.565" " int.565" $add-deflated-dropin - " ${BP}/cpu/x86/pc/olpc/images/sd.565" " ext.565" $add-deflated-dropin - " verify.img" " verify" $add-deflated-dropin - " os.public" " ospubkey" $add-dropin \ Incompressible - " fw.public" " fwpubkey" $add-dropin \ Incompressible - " fs.public" " fspubkey" $add-dropin \ Incompressible - " lease.public" " leasepubkey" $add-dropin \ Incompressible - " developer.public" " develpubkey" $add-dropin \ Incompressible
" sourceurl" " sourceurl" $add-dropin
" ${BP}/cpu/x86/pc/olpc/images/Edge1-8k-EQ-Comp-Amp-Short.wav" " splash" $add-deflated-dropin
+ " ec.img" " ecimage.bin" $add-deflated-dropin + " ${BP}/clients/emacs/x86/emacs.rc" " emacs.rc" $add-deflated-dropin + " ${BP}/clients/emacs/emacs.hlp" " emacs.hlp" $add-deflated-dropin + " ${BP}/clients/emacs/arm/emacs" " emacs" $add-deflated-dropin + + " nandblaster15_rx.bin" " nb15_rx" $add-deflated-dropin + " nandblaster_tx.bin" " nb_tx" $add-deflated-dropin + \ icons for mfg test gui " testicons/play.565" " play.565" $add-deflated-dropin " testicons/quit.565" " quit.565" $add-deflated-dropin @@ -145,21 +111,52 @@ " testicons/wifi.565" " wifi.565" $add-deflated-dropin " testicons/clock.565" " clock.565" $add-deflated-dropin " testicons/timer.565" " timer.565" $add-deflated-dropin + + " os.public" " ospubkey" $add-dropin \ Incompressible + " fw.public" " fwpubkey" $add-dropin \ Incompressible + " fs.public" " fspubkey" $add-dropin \ Incompressible + " lease.public" " leasepubkey" $add-dropin \ Incompressible + " developer.public" " develpubkey" $add-dropin \ Incompressible + + " builton.fth" " probe-" $add-dropin + +\ " ${BP}/dev/usb2/hcd/ehci/build/ehci.fc" " class0c0320" $add-deflated-dropin + " ${BP}/dev/usb2/device/hub/build/hub.fc" " usb,class9" $add-deflated-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,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 + + " ${BP}/ofw/inet/telnetd.fth" " telnetd" $add-deflated-dropin + + " ${BP}/ofw/inet/telnetd.fth" " telnetd" $add-deflated-dropin + " ${BP}/cpu/x86/pc/olpc/images/bigx.di" $add-file " ${BP}/cpu/x86/pc/olpc/images/bigcheck.di" $add-file " ${BP}/cpu/x86/pc/olpc/images/leds.di" $add-file " ${BP}/cpu/x86/pc/olpc/images/ebook.di" $add-file
- " nandblaster15_rx.bin" " nb15_rx" $add-deflated-dropin - " nandblaster_tx.bin" " nb_tx" $add-deflated-dropin -0 [if] - " ${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 -[then] - " ec.img" " ecimage.bin" $add-deflated-dropin - " ${BP}/clients/emacs/x86/emacs.rc" " emacs.rc" $add-deflated-dropin - " ${BP}/clients/emacs/emacs.hlp" " emacs.hlp" $add-deflated-dropin - " ${BP}/clients/emacs/arm/emacs" " emacs" $add-deflated-dropin +\ " ${BP}/cpu/x86/pc/olpc/images/warnings.565" " warnings.565" $add-deflated-dropin + " ${BP}/cpu/x86/pc/olpc/images/lightdot.565" " lightdot.565" $add-deflated-dropin + " ${BP}/cpu/x86/pc/olpc/images/yellowdot.565" " yellowdot.565" $add-deflated-dropin + " ${BP}/cpu/x86/pc/olpc/images/darkdot.565" " darkdot.565" $add-deflated-dropin + " ${BP}/cpu/x86/pc/olpc/images/lock.565" " lock.565" $add-deflated-dropin + " ${BP}/cpu/x86/pc/olpc/images/unlock.565" " unlock.565" $add-deflated-dropin + " ${BP}/cpu/x86/pc/olpc/images/plus.565" " plus.565" $add-deflated-dropin + " ${BP}/cpu/x86/pc/olpc/images/minus.565" " minus.565" $add-deflated-dropin + " ${BP}/cpu/x86/pc/olpc/images/x.565" " x.565" $add-deflated-dropin + " ${BP}/cpu/x86/pc/olpc/images/sad.565" " sad.565" $add-deflated-dropin + " ${BP}/cpu/x86/pc/olpc/images/bigdot.565" " bigdot.565" $add-deflated-dropin + + " ${BP}/cpu/x86/pc/olpc/images/check.565" " check.565" $add-deflated-dropin + " ${BP}/cpu/x86/pc/olpc/images/xogray.565" " xogray.565" $add-deflated-dropin + " ${BP}/cpu/x86/pc/olpc/images/ethernet.565" " ethernet.565" $add-deflated-dropin + " ${BP}/cpu/x86/pc/olpc/images/usbkey.565" " disk.565" $add-deflated-dropin + " ${BP}/cpu/x86/pc/olpc/images/wireless.565" " wlan.565" $add-deflated-dropin + " ${BP}/cpu/x86/pc/olpc/images/laptop.565" " int.565" $add-deflated-dropin + " ${BP}/cpu/x86/pc/olpc/images/sd.565" " ext.565" $add-deflated-dropin
.( Dropin top is ) ofd @ fsize .x cr