diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-03-27 19:53:36 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-03-27 19:53:36 +0000 |
| commit | e400d9ee24767bc6b7d071b957937fbb2b5a1e2b (patch) | |
| tree | 83a0693338ec4d27de0597c85a20f916c9558938 /nuttx/configs | |
| parent | d16a2aa2ac0cbbba242e1d5258e1d0d6f775672e (diff) | |
| download | px4-nuttx-e400d9ee24767bc6b7d071b957937fbb2b5a1e2b.tar.gz px4-nuttx-e400d9ee24767bc6b7d071b957937fbb2b5a1e2b.tar.bz2 px4-nuttx-e400d9ee24767bc6b7d071b957937fbb2b5a1e2b.zip | |
More changes from Uros
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3426 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/configs')
| -rwxr-xr-x | nuttx/configs/stm3210e-eval/src/Makefile | 1 | ||||
| -rw-r--r-- | nuttx/configs/stm3210e-eval/src/up_extcontext.c | 2 | ||||
| -rw-r--r-- | nuttx/configs/stm3210e-eval/src/up_selectnor.c | 6 | ||||
| -rw-r--r-- | nuttx/configs/stm3210e-eval/src/up_selectsram.c | 6 |
4 files changed, 6 insertions, 9 deletions
diff --git a/nuttx/configs/stm3210e-eval/src/Makefile b/nuttx/configs/stm3210e-eval/src/Makefile index 09f0c518f..1bd9e5581 100755 --- a/nuttx/configs/stm3210e-eval/src/Makefile +++ b/nuttx/configs/stm3210e-eval/src/Makefile @@ -43,6 +43,7 @@ AOBJS = $(ASRCS:.S=$(OBJEXT)) CSRCS = up_boot.c up_leds.c up_buttons.c up_spi.c up_usbdev.c \ up_extcontext.c up_selectnor.c up_deselectnor.c \ up_selectsram.c up_deselectsram.c + ifeq ($(CONFIG_NSH_ARCHINIT),y) CSRCS += up_nsh.c endif diff --git a/nuttx/configs/stm3210e-eval/src/up_extcontext.c b/nuttx/configs/stm3210e-eval/src/up_extcontext.c index 346692cfc..64b1d7ea6 100644 --- a/nuttx/configs/stm3210e-eval/src/up_extcontext.c +++ b/nuttx/configs/stm3210e-eval/src/up_extcontext.c @@ -45,7 +45,7 @@ #include <debug.h> #include "up_arch.h" -#include "stm32_gpio.h" +#include "stm32.h" #include "stm3210e-internal.h" #ifdef CONFIG_STM32_FSMC diff --git a/nuttx/configs/stm3210e-eval/src/up_selectnor.c b/nuttx/configs/stm3210e-eval/src/up_selectnor.c index a625abc82..3115056e0 100644 --- a/nuttx/configs/stm3210e-eval/src/up_selectnor.c +++ b/nuttx/configs/stm3210e-eval/src/up_selectnor.c @@ -2,7 +2,7 @@ * configs/stm3210e-eval/src/up_selectnor.c * arch/arm/src/board/up_selectnor.c * - * Copyright (C) 2009 Gregory Nutt. All rights reserved. + * Copyright (C) 2009, 2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -46,9 +46,7 @@ #include "chip.h" #include "up_arch.h" -#include "stm32_fsmc.h" -#include "stm32_gpio.h" -#include "stm32_internal.h" +#include "stm32.h" #include "stm3210e-internal.h" #ifdef CONFIG_STM32_FSMC diff --git a/nuttx/configs/stm3210e-eval/src/up_selectsram.c b/nuttx/configs/stm3210e-eval/src/up_selectsram.c index 67515a52d..e756aa0b8 100644 --- a/nuttx/configs/stm3210e-eval/src/up_selectsram.c +++ b/nuttx/configs/stm3210e-eval/src/up_selectsram.c @@ -2,7 +2,7 @@ * configs/stm3210e-eval/src/up_selectsram.c * arch/arm/src/board/up_selectsram.c * - * Copyright (C) 2009 Gregory Nutt. All rights reserved. + * Copyright (C) 2009, 2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -46,9 +46,7 @@ #include "chip.h" #include "up_arch.h" -#include "stm32_fsmc.h" -#include "stm32_gpio.h" -#include "stm32_internal.h" +#include "stm32.h" #include "stm3210e-internal.h" #ifdef CONFIG_STM32_FSMC |