[openfirmware] [commit] r2009 - cpu/arm/olpc/1.75

[repository service]

Author: wmb
Date: Thu Nov  4 23:13:40 2010
New Revision: 2009
URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2009

Log:
OLPC XO-1.75 - Build automation fixes.

Modified:
   cpu/arm/olpc/1.75/fw-version.fth
   cpu/arm/olpc/1.75/olpc.bth
   cpu/arm/olpc/1.75/sourceurl.fth

Modified: cpu/arm/olpc/1.75/fw-version.fth
==============================================================================
--- cpu/arm/olpc/1.75/fw-version.fth	Thu Nov  4 19:26:19 2010	(r2008)
+++ cpu/arm/olpc/1.75/fw-version.fth	Thu Nov  4 23:13:40 2010	(r2009)
@@ -1,3 +1,3 @@
 \ The overall firmware revision
 macro: FW_MAJOR A
-macro: FW_MINOR 02
+macro: FW_MINOR 03

Modified: cpu/arm/olpc/1.75/olpc.bth
==============================================================================
--- cpu/arm/olpc/1.75/olpc.bth	Thu Nov  4 19:26:19 2010	(r2008)
+++ cpu/arm/olpc/1.75/olpc.bth	Thu Nov  4 23:13:40 2010	(r2009)
@@ -4,6 +4,12 @@
 in: ${BP}/cpu/arm/olpc/1.75/build/fw.img
 in: sd8686.bin
 in: verify.img
+in: ${BP}/dev/usb2/device/hub/build/hub.fc
+in: ${BP}/dev/usb2/device/generic/build/generic.fc
+in: ${BP}/dev/usb2/device/net/build/usbnet.fc
+in: ${BP}/dev/usb2/device/keyboard/build/usbkbd.fc
+in: ${BP}/dev/usb2/device/serial/build/usbserial.fc
+in: ${BP}/dev/usb2/device/storage/build/usbstorage.fc
 build-now
 
 fload ${BP}/cpu/arm/olpc/1.75/fw-version.fth
@@ -37,8 +43,8 @@
 \ Main Processor code loaded into DRAM
 image: OBMI      800 d101c000 ${BP}/cpu/arm/olpc/1.75/dummy.img
 \ Secure Processor code loaded into SRAM
-image: WTMI     1000 d1018000 /scratchbox/users/wmb/home/wmb/cforth.git/build/arm-xo-1.75/shim.img
-image: CFTH     2000 d1000000 /scratchbox/users/wmb/home/wmb/cforth.git/build/arm-xo-1.75/app.img
+image: WTMI     1000 d1018000 ${BP}/../cforth/build/arm-xo-1.75/shim.img
+image: CFTH     2000 d1000000 ${BP}/../cforth/build/arm-xo-1.75/app.img
 \ anonymous:     20000 ${BP}/cpu/arm/olpc/1.75/build/fw.img
 reserved:
 \  fload ${BP}/cpu/arm/olpc/1.75/ddr_samsung_1g.fth

Modified: cpu/arm/olpc/1.75/sourceurl.fth
==============================================================================
--- cpu/arm/olpc/1.75/sourceurl.fth	Thu Nov  4 19:26:19 2010	(r2008)
+++ cpu/arm/olpc/1.75/sourceurl.fth	Thu Nov  4 23:13:40 2010	(r2009)
@@ -2,7 +2,6 @@
 
 show-rebuilds?  false to show-rebuilds?   \ We don't need to see these commands
 
-" svn info ../../../../.. | grep URL: | cut -d ' ' -f 2 | tr \\n ' ' >sourceurl" $sh
-" svnversion -n ../../../../.. >>sourceurl" $sh
+" if svn info ${BP} 2>/dev/null >/dev/null; then svn info ${BP} | grep URL: | cut -d ' ' -f 2 | tr \\n ' ' >sourceurl; svnversion -n ${BP} >>sourceurl; else git log -1 | grep git-svn-id: >sourceurl; fi" $sh
 
 to show-rebuilds?