Implement enable/reset of 3D engine

[kernel.git] / build

diff --git a/build b/build
index 34a34ed..a7d15f7 100755 (executable)
--- a/build
+++ b/build
@@ -24,7 +24,9 @@ fi
 
 mkdir -p $1
 
-export CROSS_COMPILE=/usr/local/openmoko/arm/bin/arm-angstrom-linux-gnueabi-
+if [ -z "$CROSS_COMPILE" ]; then
+    export CROSS_COMPILE=/usr/local/openmoko/arm/bin/arm-angstrom-linux-gnueabi-
+fi
 make O=$1 ARCH=arm silentoldconfig
 
 #
@@ -43,9 +45,9 @@ if [ ! -z "`grep CONFIG_MACH_NEO1973_GTA02=y $1/.config`" ] ; then
        PRODUCT=GTA02
 fi
 
-if [ ! -z "`grep CONFIG_MACH_OPENMOKO_GTA03=y $1/.config`" ] ; then
+if [ ! -z "`grep CONFIG_MACH_OM_3D7K=y $1/.config`" ] ; then
         START=50008000
-        PRODUCT=GTA03
+        PRODUCT=OM_3D7K
 fi
 
 if [ ! -z "`grep CONFIG_MACH_SMDK6410=y $1/.config`" ] ; then
@@ -67,7 +69,7 @@ fi
 # check that we are in a valid branch
 #
 
-if git-branch | head -n1 | grep -q "* (no branch)"; then
+if git branch | head -n1 | grep -q "* (no branch)"; then
        cat <<EOF 1>&2
 There is no branch in the local copy of the repository right now!
 Hint: type git-branch, make sure you are in a valid branch and then try again