Changeset 2997

Timestamp:

Jun 1, 2012 8:57:38 PM (12 months ago)

Author:

wmb

Message:

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.

Location:

cpu

Files:

• arm/olpc/1.75/mcnand-version.fth (modified) (1 diff)
• x86/pc/olpc/versions.fth (modified) (2 diffs)
• x86/pc/olpc/via/mcnand-version.fth (modified) (1 diff)

cpu/arm/olpc/1.75/mcnand-version.fth

@@ -4 +4 @@
 \ 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

cpu/x86/pc/olpc/versions.fth

@@ -3 +3 @@
 \ The overall firmware revision
 macro: FW_MAJOR F
-macro: FW_MINOR 11
+macro: FW_MINOR 11ma
 
 \ The EC microcode
@@ -27 +27 @@
 \ 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

cpu/x86/pc/olpc/via/mcnand-version.fth

@@ -4 +4 @@
 \ 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