Minor and cosmetic changes from initial 16z (v2) bringup

This commit is contained in:
Gregory Nutt 2014-04-24 15:55:53 -06:00
parent a1a6ef403e
commit 9a73ed6429
4 changed files with 10 additions and 8 deletions

View File

@ -34,11 +34,12 @@
#
############################################################################
USAGE="${0} \$PWD"
USAGE="${0} [-R] \$PWD"
WD=`pwd`
TOOLDIR=${WD}/configs/16z/tools
ME=${TOOLDIR}/dopatch.sh
PATCH=${TOOLDIR}/zneo-zdsii-5_0_1-variadic-func-fix.patch
ARGS=${1}
if [ ! -x ${ME} ]; then
echo "ERROR: This script must be executed from the top-level NuttX directory"
@ -55,5 +56,5 @@ fi
cd .. || \
{ echo "ERROR: failed to CD to the parent directory"; exit 1; }
cat ${PATCH} | patch -p1 || \
cat ${PATCH} | patch ${ARGS} -p1 || \
{ echo "ERROR: patch failed" ; exit 1; }

View File

@ -1,5 +1,5 @@
diff --git a/apps/nshlib/nsh_console.c b/apps/nshlib/nsh_console.c
index ba7dbe7..b9f9991 100644
index ba7dbe7..45e4ab1 100644
--- a/apps/nshlib/nsh_console.c
+++ b/apps/nshlib/nsh_console.c
@@ -46,6 +46,7 @@
@ -113,7 +113,7 @@ index ba7dbe7..b9f9991 100644
+ return ret;
+}
diff --git a/apps/nshlib/nsh_console.h b/apps/nshlib/nsh_console.h
index c78362f..59bd8d7 100644
index c78362f..207f9b9 100644
--- a/apps/nshlib/nsh_console.h
+++ b/apps/nshlib/nsh_console.h
@@ -47,6 +47,7 @@

View File

@ -34,11 +34,12 @@
#
############################################################################
USAGE="${0} \$PWD"
USAGE="${0} [-R] \$PWD"
WD=`pwd`
TOOLDIR=${WD}/configs/z16f2800100zcog/tools
ME=${TOOLDIR}/dopatch.sh
PATCH=${TOOLDIR}/zneo-zdsii-5_0_1-variadic-func-fix.patch
ARGS=${1}
if [ ! -x ${ME} ]; then
echo "ERROR: This script must be executed from the top-level NuttX directory"
@ -55,5 +56,5 @@ fi
cd .. || \
{ echo "ERROR: failed to CD to the parent directory"; exit 1; }
cat ${PATCH} | patch -p1 || \
cat ${PATCH} | patch ${ARGS} -p1 || \
{ echo "ERROR: patch failed" ; exit 1; }

View File

@ -1,5 +1,5 @@
diff --git a/apps/nshlib/nsh_console.c b/apps/nshlib/nsh_console.c
index ba7dbe7..b9f9991 100644
index ba7dbe7..45e4ab1 100644
--- a/apps/nshlib/nsh_console.c
+++ b/apps/nshlib/nsh_console.c
@@ -46,6 +46,7 @@
@ -113,7 +113,7 @@ index ba7dbe7..b9f9991 100644
+ return ret;
+}
diff --git a/apps/nshlib/nsh_console.h b/apps/nshlib/nsh_console.h
index c78362f..59bd8d7 100644
index c78362f..207f9b9 100644
--- a/apps/nshlib/nsh_console.h
+++ b/apps/nshlib/nsh_console.h
@@ -47,6 +47,7 @@