diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-03-06 03:32:15 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-03-06 03:32:15 +0000 |
| commit | 84beafe48b5fdb3bf8dfc80bf84ce922eb7dba31 (patch) | |
| tree | 4126086afc9615dfee8509fe913fdc1a716d6b14 | |
| parent | 37a1883664d40bc4c6854edd29dd5014dbb3d1c7 (diff) | |
| download | px4-nuttx-84beafe48b5fdb3bf8dfc80bf84ce922eb7dba31.tar.gz px4-nuttx-84beafe48b5fdb3bf8dfc80bf84ce922eb7dba31.tar.bz2 px4-nuttx-84beafe48b5fdb3bf8dfc80bf84ce922eb7dba31.zip | |
Fix QEMU build target name
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3345 42af7a65-404d-4744-a932-0658087f49c3
| -rw-r--r-- | nuttx/ChangeLog | 2 | ||||
| -rw-r--r-- | nuttx/Documentation/NuttX.html | 2 | ||||
| -rw-r--r-- | nuttx/arch/x86/src/Makefile | 4 | ||||
| -rw-r--r-- | nuttx/configs/qemu-i486/ostest/defconfig | 4 |
4 files changed, 9 insertions, 3 deletions
diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog index 6b4fd3bc5..b3392b89d 100644 --- a/nuttx/ChangeLog +++ b/nuttx/ChangeLog @@ -1526,3 +1526,5 @@ i486 port. * arch/arm/src/stm32/stm32_spi.c -- Correct base address of SPI3 (reported by Uros Platise). + * drivers/mmcsd/mmcsd_sdio.c -- Correct a loop termination condition (also + reported by Uros Platise). diff --git a/nuttx/Documentation/NuttX.html b/nuttx/Documentation/NuttX.html index b895341ee..d0c2a40bd 100644 --- a/nuttx/Documentation/NuttX.html +++ b/nuttx/Documentation/NuttX.html @@ -2150,6 +2150,8 @@ nuttx-5.19 2011-xx-xx Gregory Nutt <spudmonkey@racsa.co.cr> i486 port. * arch/arm/src/stm32/stm32_spi.c -- Correct base address of SPI3 (reported by Uros Platise). + * drivers/mmcsd/mmcsd_sdio.c -- Correct a loop termination condition (also + reported by Uros Platise). pascal-2.1 2011-xx-xx Gregory Nutt <spudmonkey@racsa.co.cr> diff --git a/nuttx/arch/x86/src/Makefile b/nuttx/arch/x86/src/Makefile index e34e85338..ea9fc819e 100644 --- a/nuttx/arch/x86/src/Makefile +++ b/nuttx/arch/x86/src/Makefile @@ -42,13 +42,13 @@ ARCH_SUBDIR = i486 endif ifeq ($(WINTOOL),y) - NUTTX = "${shell cygpath -w $(TOPDIR)/nuttx$(EXEEXT)}" + NUTTX = "${shell cygpath -w $(TOPDIR)/nuttx}" CFLAGS += -I "${shell cygpath -w $(ARCH_SRCDIR)/chip}" \ -I "${shell cygpath -w $(ARCH_SRCDIR)/common}" \ -I "${shell cygpath -w $(ARCH_SRCDIR)/$(ARCH_SUBDIR)}" \ -I "${shell cygpath -w $(TOPDIR)/sched}" else - NUTTX = $(TOPDIR)/nuttx$(EXEEXT) + NUTTX = $(TOPDIR)/nuttx CFLAGS += -I$(ARCH_SRCDIR)/chip -I$(ARCH_SRCDIR)/common \ -I$(ARCH_SRCDIR)/$(ARCH_SUBDIR) -I$(TOPDIR)/sched endif diff --git a/nuttx/configs/qemu-i486/ostest/defconfig b/nuttx/configs/qemu-i486/ostest/defconfig index 44cb27a03..8ab964e79 100644 --- a/nuttx/configs/qemu-i486/ostest/defconfig +++ b/nuttx/configs/qemu-i486/ostest/defconfig @@ -65,6 +65,7 @@ # the 100 second delay then adjust CONFIG_BOARD_LOOPSPERMSEC until # the delay actually is 100 seconds. # CONFIG_ARCH_DMA - Support DMA initialization +# CONFIG_X86_NASM - Using Nasm instead of GAS # CONFIG_ARCH=x86 CONFIG_ARCH_X86=y @@ -82,6 +83,7 @@ CONFIG_ARCH_LEDS=n CONFIG_ARCH_BUTTONS=n CONFIG_ARCH_CALIBRATION=n CONFIG_ARCH_DMA=n +CONFIG_X86_NASM=n # # General OS setup @@ -213,7 +215,7 @@ CONFIG_ARCH_KMALLOC=n CONFIG_ARCH_KZMALLOC=n CONFIG_ARCH_KFREE=n -## +# # General build options # # CONFIG_RRLOAD_BINARY - make the rrload binary format used with BSPs from |