diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-06-07 23:02:34 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-06-07 23:02:34 +0000 |
| commit | 34f8aab8f0e19cc5bd0dae6bf7db3eb1d164836c (patch) | |
| tree | 3f168e4ef907c5b7d53e465f31849941e24c2cf3 /nuttx/configs/micropendous3/src | |
| parent | cb336ef5d2995014cb4f2ab74db2756621144c74 (diff) | |
| download | nuttx-34f8aab8f0e19cc5bd0dae6bf7db3eb1d164836c.tar.gz nuttx-34f8aab8f0e19cc5bd0dae6bf7db3eb1d164836c.tar.bz2 nuttx-34f8aab8f0e19cc5bd0dae6bf7db3eb1d164836c.zip | |
More AVR build fixes
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3680 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/configs/micropendous3/src')
| -rwxr-xr-x | nuttx/configs/micropendous3/src/Makefile | 21 | ||||
| -rwxr-xr-x | nuttx/configs/micropendous3/src/up_boot.c | 4 |
2 files changed, 17 insertions, 8 deletions
diff --git a/nuttx/configs/micropendous3/src/Makefile b/nuttx/configs/micropendous3/src/Makefile index 005e4767f..b027183c4 100755 --- a/nuttx/configs/micropendous3/src/Makefile +++ b/nuttx/configs/micropendous3/src/Makefile @@ -35,8 +35,6 @@ -include $(TOPDIR)/Make.defs -CFLAGS += -I$(TOPDIR)/sched - ASRCS = CSRCS = up_boot.c @@ -51,12 +49,23 @@ SRCS = $(ASRCS) $(CSRCS) OBJS = $(AOBJS) $(COBJS) ARCH_SRCDIR = $(TOPDIR)/arch/$(CONFIG_ARCH)/src +ifeq ($(CONFIG_ARCH_AVR32),y) +ARCH_SUBDIR = avr32 +endif +ifeq ($(CONFIG_ARCH_AVR),y) +ARCH_SUBDIR = avr +endif + ifeq ($(WINTOOL),y) - CFLAGS += -I "${shell cygpath -w $(ARCH_SRCDIR)/chip}" \ - -I "${shell cygpath -w $(ARCH_SRCDIR)/common}" \ - -I "${shell cygpath -w $(ARCH_SRCDIR)/mips32}" + CFLAGS += -I "${shell cygpath -w $(TOPDIR)/sched}" + CFLAGS += -I "${shell cygpath -w $(ARCH_SRCDIR)/chip}" + CFLAGS += -I "${shell cygpath -w $(ARCH_SRCDIR)/common}" + CFLAGS += -I "${shell cygpath -w $(ARCH_SRCDIR)/$(ARCH_SUBDIR)}" else - CFLAGS += -I$(ARCH_SRCDIR)/chip -I$(ARCH_SRCDIR)/common -I$(ARCH_SRCDIR)/mips32 + CFLAGS += -I "$(TOPDIR)/sched" + CFLAGS += -I "$(ARCH_SRCDIR)/chip" + CFLAGS += -I "$(ARCH_SRCDIR)/common" + CFLAGS += -I "$(ARCH_SRCDIR)/$(ARCH_SUBDIR)" endif all: libboard$(LIBEXT) diff --git a/nuttx/configs/micropendous3/src/up_boot.c b/nuttx/configs/micropendous3/src/up_boot.c index 67838097a..c6e261a45 100755 --- a/nuttx/configs/micropendous3/src/up_boot.c +++ b/nuttx/configs/micropendous3/src/up_boot.c @@ -47,8 +47,8 @@ #include "up_arch.h" #include "up_internal.h" -#include "at90usb-internal.h" -#include "micropendous3-internal.h" +#include "at90usb_internal.h" +#include "micropendous3_internal.h" /************************************************************************************ * Definitions |