[commit] r2997 - in cpu: arm/olpc/1.75 x86/pc/olpc x86/pc/olpc/via

[repository service]

Author: wmb
Date: Fri Jun  1 20:57:38 2012
New Revision: 2997
URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2997

Log:
OLPC - use a different commit id for the NANDblaster code, fixing a build dependency problem introduced by the name change from start.s to start.S in the x86 directory of the client library.

Modified:
   cpu/arm/olpc/1.75/mcnand-version.fth
   cpu/x86/pc/olpc/versions.fth
   cpu/x86/pc/olpc/via/mcnand-version.fth

Modified: cpu/arm/olpc/1.75/mcnand-version.fth
==============================================================================
--- cpu/arm/olpc/1.75/mcnand-version.fth	Fri Jun  1 20:33:29 2012	(r2996)
+++ cpu/arm/olpc/1.75/mcnand-version.fth	Fri Jun  1 20:57:38 2012	(r2997)
@@ -3,6 +3,6 @@
 \ With a specific ID, mcastnand.bth will download a tarball without .git stuff.
 \ With "test", mcastnand.bth will clone the git head if build/multicast-nand/
 \ is not already present, then you can modify the git subtree as needed.
-macro: MCNAND_VERSION 732fc96
+macro: MCNAND_VERSION e9c0662
 \ macro: MCNAND_VERSION test
 \ macro: MCNAND_VERSION HEAD

Modified: cpu/x86/pc/olpc/versions.fth
==============================================================================
--- cpu/x86/pc/olpc/versions.fth	Fri Jun  1 20:33:29 2012	(r2996)
+++ cpu/x86/pc/olpc/versions.fth	Fri Jun  1 20:57:38 2012	(r2997)
@@ -2,7 +2,7 @@

\ The overall firmware revision
 macro: FW_MAJOR F
-macro: FW_MINOR 11
+macro: FW_MINOR 11ma

\ The EC microcode
 macro: EC_VERSION 1_2_1
@@ -26,6 +26,6 @@
 \ With a specific ID, mcastnand.bth will download a tarball without .git stuff.
 \ With "test", mcastnand.bth will clone the git head if build/multicast-nand/
 \ is not already present, then you can modify the git subtree as needed.
-macro: MCNAND_VERSION 732fc96
+macro: MCNAND_VERSION e9c0662
 \ macro: MCNAND_VERSION test
 \ macro: MCNAND_VERSION HEAD

Modified: cpu/x86/pc/olpc/via/mcnand-version.fth
==============================================================================
--- cpu/x86/pc/olpc/via/mcnand-version.fth	Fri Jun  1 20:33:29 2012	(r2996)
+++ cpu/x86/pc/olpc/via/mcnand-version.fth	Fri Jun  1 20:57:38 2012	(r2997)
@@ -3,6 +3,6 @@
 \ With a specific ID, mcastnand.bth will download a tarball without .git stuff.
 \ With "test", mcastnand.bth will clone the git head if build/multicast-nand/
 \ is not already present, then you can modify the git subtree as needed.
-macro: MCNAND_VERSION 732fc96
+macro: MCNAND_VERSION e9c0662
 \ macro: MCNAND_VERSION test
 \ macro: MCNAND_VERSION HEAD