diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2014-04-24 15:55:53 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2014-04-24 15:55:53 -0600 |
| commit | 782f0182d4b4e06f7fae8811dd2dbd9b3ac3600e (patch) | |
| tree | 9bc5a400223d9d9aa2181d516b88fbeead303f28 /nuttx/configs/16z | |
| parent | e18ac0d6899d10b9d25c1e40f62d46d18cf71b30 (diff) | |
| download | nuttx-782f0182d4b4e06f7fae8811dd2dbd9b3ac3600e.tar.gz nuttx-782f0182d4b4e06f7fae8811dd2dbd9b3ac3600e.tar.bz2 nuttx-782f0182d4b4e06f7fae8811dd2dbd9b3ac3600e.zip | |
Minor and cosmetic changes from initial 16z (v2) bringup
Diffstat (limited to 'nuttx/configs/16z')
| -rwxr-xr-x | nuttx/configs/16z/tools/dopatch.sh | 5 | ||||
| -rw-r--r-- | nuttx/configs/16z/tools/zneo-zdsii-5_0_1-variadic-func-fix.patch | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/nuttx/configs/16z/tools/dopatch.sh b/nuttx/configs/16z/tools/dopatch.sh index 5eaa8b881..1193ff792 100755 --- a/nuttx/configs/16z/tools/dopatch.sh +++ b/nuttx/configs/16z/tools/dopatch.sh @@ -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; } diff --git a/nuttx/configs/16z/tools/zneo-zdsii-5_0_1-variadic-func-fix.patch b/nuttx/configs/16z/tools/zneo-zdsii-5_0_1-variadic-func-fix.patch index b1464f340..b22efeb86 100644 --- a/nuttx/configs/16z/tools/zneo-zdsii-5_0_1-variadic-func-fix.patch +++ b/nuttx/configs/16z/tools/zneo-zdsii-5_0_1-variadic-func-fix.patch @@ -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 @@ |