diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2013-03-03 21:41:21 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2013-03-03 21:41:21 +0000 |
| commit | d9ac685b16bf68a3b66996ea43d6d345159f2208 (patch) | |
| tree | 4c1ffc2b9aa07404a1a858178966ca21e064b37c | |
| parent | 02903ff65120721bd80ac60925c04a984f3cb7ca (diff) | |
| download | nuttx-d9ac685b16bf68a3b66996ea43d6d345159f2208.tar.gz nuttx-d9ac685b16bf68a3b66996ea43d6d345159f2208.tar.bz2 nuttx-d9ac685b16bf68a3b66996ea43d6d345159f2208.zip | |
Two fixes from Mike Smith: (1) use -m install of --mode in install commands, (2) fix typo in stm32_exti.h introduced with the STM32 F3 port
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5701 42af7a65-404d-4744-a932-0658087f49c3
| -rw-r--r-- | apps/examples/posix_spawn/filesystem/Makefile | 2 | ||||
| -rw-r--r-- | apps/examples/posix_spawn/filesystem/redirect/Makefile | 2 | ||||
| -rw-r--r-- | nuttx/arch/arm/src/stm32/chip/stm32_exti.h | 2 | ||||
| -rw-r--r-- | nuttx/configs/us7032evb1/shterm/Makefile | 2 | ||||
| -rwxr-xr-x | nuttx/tools/mkromfsimg.sh | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/apps/examples/posix_spawn/filesystem/Makefile b/apps/examples/posix_spawn/filesystem/Makefile index 26897426c..7e25ce241 100644 --- a/apps/examples/posix_spawn/filesystem/Makefile +++ b/apps/examples/posix_spawn/filesystem/Makefile @@ -66,7 +66,7 @@ redirect/redirect: $(ROMFS_IMG): hello/hello redirect/redirect testdata.txt $(ROMFS_DIR) $(Q) $(MAKE) -C hello install TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)" ROMFS_DIR="$(ROMFS_DIR)" $(Q) $(MAKE) -C redirect install TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)" ROMFS_DIR="$(ROMFS_DIR)" - $(Q) install --mode=0644 testdata.txt $(ROMFS_DIR)/testdata.txt + $(Q) install -m 0644 testdata.txt $(ROMFS_DIR)/testdata.txt $(Q) genromfs -f $@ -d $(ROMFS_DIR) -V "POSIXSPAWN" # Create the romfs.h header file from the romfs.img file diff --git a/apps/examples/posix_spawn/filesystem/redirect/Makefile b/apps/examples/posix_spawn/filesystem/redirect/Makefile index 421ff014a..e5f5e985c 100644 --- a/apps/examples/posix_spawn/filesystem/redirect/Makefile +++ b/apps/examples/posix_spawn/filesystem/redirect/Makefile @@ -56,4 +56,4 @@ clean: install: $(Q) mkdir -p $(ROMFS_DIR) - $(Q) install --mode=0755 $(BIN) $(ROMFS_DIR)/$(BIN) + $(Q) install -m 0755 $(BIN) $(ROMFS_DIR)/$(BIN) diff --git a/nuttx/arch/arm/src/stm32/chip/stm32_exti.h b/nuttx/arch/arm/src/stm32/chip/stm32_exti.h index b9b27e347..1f02f7fee 100644 --- a/nuttx/arch/arm/src/stm32/chip/stm32_exti.h +++ b/nuttx/arch/arm/src/stm32/chip/stm32_exti.h @@ -55,7 +55,7 @@ # define STM32_NEXTI 19 # define STM32_EXTI_MASK 0x0007ffff # endif -#eif defined(CONFIG_STM32_STM32F30XX) +#elif defined(CONFIG_STM32_STM32F30XX) # define STM32_NEXTI1 31 # define STM32_EXTI1_MASK 0xffffffff # define STM32_NEXTI2 4 diff --git a/nuttx/configs/us7032evb1/shterm/Makefile b/nuttx/configs/us7032evb1/shterm/Makefile index 7eba21db0..67787148b 100644 --- a/nuttx/configs/us7032evb1/shterm/Makefile +++ b/nuttx/configs/us7032evb1/shterm/Makefile @@ -44,7 +44,7 @@ $(BIN)$(EXEEXT): $(SRC) $(HOSTCC) $(HOSTCFLAGS) $^ -o $@ ..$(DELIM)bin$(DELIM)$(BIN)$(EXEEXT): $(BIN)$(EXEEXT) - install --mode 0755 $^ $@ + install -m 0755 $^ $@ clean: $(call DELFILE, $(BIN)$(EXEEXT)) diff --git a/nuttx/tools/mkromfsimg.sh b/nuttx/tools/mkromfsimg.sh index 8811f1953..25329827b 100755 --- a/nuttx/tools/mkromfsimg.sh +++ b/nuttx/tools/mkromfsimg.sh @@ -246,7 +246,7 @@ cat $rcstemplate | \ # And install it at the specified relative location -install -D --mode=0755 $rcsfile $workingdir/$uinitscript || \ +install -D -m 0755 $rcsfile $workingdir/$uinitscript || \ { echo "Failed to install $rcsfile at $workingdir/$uinitscript"; rm -f $rcsfile; exit 1; } rm -f $rcsfile |