diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2007-04-22 20:40:10 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2007-04-22 20:40:10 +0000 |
| commit | 170ec8f545ce2ea7928a00e112ffc70b0f0a5281 (patch) | |
| tree | 2110e607a492ffc23adc598dea9ecb594113412a | |
| parent | a63045942bc5bc4ce3c7ce813f8b3361dba79d68 (diff) | |
| download | nuttx-170ec8f545ce2ea7928a00e112ffc70b0f0a5281.tar.gz nuttx-170ec8f545ce2ea7928a00e112ffc70b0f0a5281.tar.bz2 nuttx-170ec8f545ce2ea7928a00e112ffc70b0f0a5281.zip | |
Misc changes to good c5471 build on Cygwin
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@183 42af7a65-404d-4744-a932-0658087f49c3
| -rw-r--r-- | nuttx/ChangeLog | 1 | ||||
| -rw-r--r-- | nuttx/Documentation/NuttX.html | 1 | ||||
| -rw-r--r-- | nuttx/arch/c5471/src/Makefile | 2 | ||||
| -rw-r--r-- | nuttx/arch/dm320/src/Makefile | 2 | ||||
| -rwxr-xr-x | nuttx/tools/mkimage.sh | 30 |
5 files changed, 11 insertions, 25 deletions
diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog index b1da12e2c..b4364a331 100644 --- a/nuttx/ChangeLog +++ b/nuttx/ChangeLog @@ -113,4 +113,5 @@ 0.2.4 2007-xx-xx Gregory Nutt <spudmonkey@racsa.co.cr> + * Verfied c5471 build under Cygwin on WinXP * Started m68322 diff --git a/nuttx/Documentation/NuttX.html b/nuttx/Documentation/NuttX.html index f4b8cfa8f..52cc244cb 100644 --- a/nuttx/Documentation/NuttX.html +++ b/nuttx/Documentation/NuttX.html @@ -474,6 +474,7 @@ Other memory: 0.2.4 2007-xx-xx Gregory Nutt <spudmonkey@racsa.co.cr> + * Verfied c5471 build under Cygwin on WinXP * Started m68322 </pre></ul> diff --git a/nuttx/arch/c5471/src/Makefile b/nuttx/arch/c5471/src/Makefile index d1d2ea0cf..c91a1820e 100644 --- a/nuttx/arch/c5471/src/Makefile +++ b/nuttx/arch/c5471/src/Makefile @@ -98,7 +98,7 @@ nuttx: $(LINKOBJS) board/libboard$(LIBEXT) mv $(TOPDIR)/$@.flashimage $(TOPDIR)/$@; \ fi ifeq ($(CONFIG_RRLOAD_BINARY),y) - @$(TOPDIR)/tools/mkimage.sh $(TOPDIR)/$@ $(TOPDIR)/$@.rr + @$(TOPDIR)/tools/mkimage.sh --Prefix $(CROSSDEV) $(TOPDIR)/$@ $(TOPDIR)/$@.rr @if [ -w /tftpboot ] ; then \ cp -f $(TOPDIR)/$@.rr /tftpboot/$@.rr.${CONFIG_ARCH}; \ fi diff --git a/nuttx/arch/dm320/src/Makefile b/nuttx/arch/dm320/src/Makefile index 702d57951..80f73d15d 100644 --- a/nuttx/arch/dm320/src/Makefile +++ b/nuttx/arch/dm320/src/Makefile @@ -96,7 +96,7 @@ nuttx: $(LINKOBJS) board/libboard$(LIBEXT) mv $(TOPDIR)/$@.flashimage $(TOPDIR)/$@; \ fi ifeq ($(CONFIG_RRLOAD_BINARY),y) - @$(TOPDIR)/tools/mkimage.sh $(TOPDIR)/$@ $(TOPDIR)/$@.rr + @$(TOPDIR)/tools/mkimage.sh --Prefix $(CROSSDEV) $(TOPDIR)/$@ $(TOPDIR)/$@.rr @if [ -w /tftpboot ] ; then \ cp -f $(TOPDIR)/$@.rr /tftpboot/$@.rr.${CONFIG_ARCH}; \ fi diff --git a/nuttx/tools/mkimage.sh b/nuttx/tools/mkimage.sh index 8a32cc030..90f4176b1 100755 --- a/nuttx/tools/mkimage.sh +++ b/nuttx/tools/mkimage.sh @@ -95,31 +95,9 @@ # leading "0x". ######################################################## -if [ "${CADENUX_ARCH}" = "dsc21" ] ; then - prefix="arm-uclinux-" -elif [ "${CADENUX_ARCH}" = "dsc24" ] ; then - prefix="arm-uclinux-" -elif [ "${CADENUX_ARCH}" = "dsc25" ] ; then - prefix="arm-uclinux-" -elif [ "${CADENUX_ARCH}" = "dm270" ] ; then - prefix="arm-uclinux-" -elif [ "${CADENUX_ARCH}" = "c5471" ] ; then - prefix="arm-uclinux-" -elif [ "${CADENUX_ARCH}" = "ti925" ] ; then - prefix="arm-linux-" -elif [ "${CADENUX_ARCH}" = "omap710" ] ; then - prefix="arm-linux-" -elif [ "${CADENUX_ARCH}" = "omap1510" ] ; then - prefix="arm-linux-" -elif [ "${CADENUX_ARCH}" = "dm310" ] ; then - prefix="arm-linux-" -else - prefix="" -fi - if [ $# -lt 2 ] ; then echo "Error: missing argument" - echo "Usage: mkimage [--LAddr n] [--EAddr n] [--NoHeader] <input-Bin> <out-RR>" + echo "Usage: mkimage [--Prefix prefix] [--LAddr n] [--EAddr n] [--NoHeader] <input-Bin> <out-RR>" exit 1 fi @@ -128,6 +106,7 @@ fi LoadAddr="00000000" # Note: hex val *without* proceeding "0x" EntryAddr="0xFFFFFFFF" # Note: hex val *with* procedding "0x" +unset prefix Header="y" LAddrSupplied="n" EAddrSupplied="n" @@ -135,6 +114,11 @@ compress="n" while [ $# -gt 0 ] ; do case "$1" in + --Prefix) + shift; + prefix="$1" + shift + ;; --LAddr ) shift LoadAddr="$1" |