diff --git a/.gitignore b/.gitignore
index 3ec700458d0..9bfa923affd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,15 +1,3 @@
-.depend
-Make.dep
-*.o
-*.a
-*.d
-*.i
-*~
-.swp
-.*.swp
-core
-.gdbinit
-cscope.out
 /.config
 /.config.old
 /.version
diff --git a/tools/testbuild.sh b/tools/testbuild.sh
index 7fb1f32c35c..9546c921447 100755
--- a/tools/testbuild.sh
+++ b/tools/testbuild.sh
@@ -180,7 +180,7 @@ function configure {
     fi
 
     if [ "X$toolchain" != "X" ]; then
-        setting=`grep TOOLCHAIN $nuttx/.config | grep -v CONFIG_ARM_TOOLCHAIN_GNU | grep =y`
+        setting=`grep TOOLCHAIN $nuttx/.config | grep -v CONFIG_ARM_TOOLCHAIN_GNU=y | grep =y`
         varname=`echo $setting | cut -d'=' -f1`
         if [ ! -z "varname" ]; then
             echo "  Disabling $varname"