diff options
author | Gregory Nutt <gnutt@nuttx.org> | 2013-12-13 13:09:45 -0600 |
---|---|---|
committer | Gregory Nutt <gnutt@nuttx.org> | 2013-12-13 13:09:45 -0600 |
commit | ebbd084451b15ba10af975e416854737173cc930 (patch) | |
tree | 014d1a895cdaf2f2b33ab97dde06895c6a96c393 /nuttx | |
parent | 295a22a1b13a6d9521c0be95cd9b35223b6aee15 (diff) | |
download | px4-nuttx-ebbd084451b15ba10af975e416854737173cc930.tar.gz px4-nuttx-ebbd084451b15ba10af975e416854737173cc930.tar.bz2 px4-nuttx-ebbd084451b15ba10af975e416854737173cc930.zip |
Eliminate some warnings in the pcDuino A10 build
Diffstat (limited to 'nuttx')
-rw-r--r-- | nuttx/arch/arm/src/a1x/a1x_boot.c | 4 | ||||
-rw-r--r-- | nuttx/arch/arm/src/a1x/a1x_lowputc.h | 103 | ||||
-rw-r--r-- | nuttx/arch/arm/src/a1x/chip/a10_memorymap.h | 6 | ||||
-rw-r--r-- | nuttx/configs/pcduino-a10/include/board.h | 4 | ||||
-rw-r--r-- | nuttx/configs/pcduino-a10/src/pcduino_a10.h | 1 |
5 files changed, 107 insertions, 11 deletions
diff --git a/nuttx/arch/arm/src/a1x/a1x_boot.c b/nuttx/arch/arm/src/a1x/a1x_boot.c index 3d87b06c5..203de866f 100644 --- a/nuttx/arch/arm/src/a1x/a1x_boot.c +++ b/nuttx/arch/arm/src/a1x/a1x_boot.c @@ -55,6 +55,8 @@ #include "up_internal.h" #include "up_arch.h" +#include "a1x_lowputc.h" + /**************************************************************************** * Pre-processor Definitions ****************************************************************************/ @@ -339,7 +341,7 @@ void up_boot(void) */ #ifdef USE_EARLYSERIALINIT - a1x_earlyserialinit(); + up_earlyserialinit(); #endif /* For the case of the separate user-/kernel-space build, perform whatever diff --git a/nuttx/arch/arm/src/a1x/a1x_lowputc.h b/nuttx/arch/arm/src/a1x/a1x_lowputc.h new file mode 100644 index 000000000..7c04a4468 --- /dev/null +++ b/nuttx/arch/arm/src/a1x/a1x_lowputc.h @@ -0,0 +1,103 @@ +/**************************************************************************** + * arch/arm/src/a1x/a1x_lowputc.h + * + * Copyright (C) 2013 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt <gnutt@nuttx.org> + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * 3. Neither the name NuttX nor the names of its contributors may be + * used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + * + ****************************************************************************/ + +#ifndef __ARCH_ARM_SRC_A1X_A1X_LOWPUTC_H +#define __ARCH_ARM_SRC_A1X_A1X_LOWPUTC_H + +/**************************************************************************** + * Included Files + ****************************************************************************/ + +#include <nuttx/config.h> +#include <nuttx/compiler.h> + +#include <sys/types.h> +#include <stdint.h> +#include <stdbool.h> + +#include "up_internal.h" +#include "chip.h" + +/**************************************************************************** + * Pre-processor Definitions + ****************************************************************************/ + +/**************************************************************************** + * Public Types + ****************************************************************************/ + +/**************************************************************************** + * Inline Functions + ****************************************************************************/ + +#ifndef __ASSEMBLY__ + +/**************************************************************************** + * Public Data + ****************************************************************************/ + +#undef EXTERN +#if defined(__cplusplus) +#define EXTERN extern "C" +extern "C" +{ +#else +#define EXTERN extern +#endif + +/**************************************************************************** + * Public Function Prototypes + ****************************************************************************/ + +/**************************************************************************** + * Name: a1x_lowsetup + * + * Description: + * Called at the very beginning of _start. Performs low level + * initialization including setup of the console UART. This UART done + * early so that the serial console is available for debugging very early + * in the boot sequence. + * + ****************************************************************************/ + +void a1x_lowsetup(void); + +#undef EXTERN +#if defined(__cplusplus) +} +#endif + +#endif /* __ASSEMBLY__ */ +#endif /* __ARCH_ARM_SRC_A1X_A1X_LOWPUTC_H */ diff --git a/nuttx/arch/arm/src/a1x/chip/a10_memorymap.h b/nuttx/arch/arm/src/a1x/chip/a10_memorymap.h index 6f102e328..f29fc3fc9 100644 --- a/nuttx/arch/arm/src/a1x/chip/a10_memorymap.h +++ b/nuttx/arch/arm/src/a1x/chip/a10_memorymap.h @@ -98,7 +98,6 @@ #define A1X_SS_OFFSET 0x00015000 /* SS 0x01c1:5000-0x01c1:5fff 4K */ #define A1X_HDMI_OFFSET 0x00016000 /* HDMI 0x01c1:6000-0x01c1:6fff 4K */ #define A1X_SPI2_OFFSET 0x00017000 /* SPI 2 0x01c1:7000-0x01c1:7fff 4K */ -#define A1X_NC_OFFSET 0x00018000 /* NC 0x01c1:8000-0x01c1:8fff 4K */ #define A1X_PATA_OFFSET 0x00019000 /* PATA 0x01c1:9000-0x01c1:9fff 4K */ #define A1X_ACE_OFFSET 0x0001a000 /* ACE 0x01c1:A000-0x01c1:afff 4K */ #define A1X_TVE1_OFFSET 0x0001b000 /* TVE 1 0x01c1:B000-0x01c1:bfff 4K */ @@ -110,7 +109,6 @@ #define A1X_INTC_OFFSET 0x00020400 /* INTC 0x01c2:0400-0x01c2:07ff 1K */ #define A1X_PIO_OFFSET 0x00020800 /* PIO 0x01c2:0800-0x01c2:0bff 1K */ #define A1X_TIMER_OFFSET 0x00020c00 /* Timer 0x01c2:0C00-0x01c2:0fff 1K */ -#define A1X_NC_OFFSET 0x00021000 /* NC 0x01c2:1000-0x01c2:13ff 1K */ #define A1X_AC97_OFFSET 0x00021400 /* AC97 0x01c2:1400-0x01c2:17ff 1K */ #define A1X_IR0_OFFSET 0x00021800 /* IR 0 0x01c2:1800-0x01c2:1bff 1K */ #define A1X_IR1_OFFSET 0x00021c00 /* IR 1 0x01c2:1c00-0x01c2:1fff 1K */ @@ -190,7 +188,6 @@ #define A1X_SS_PADDR (A1X_PERIPH_PSECTION+A1X_SS_OFFSET) #define A1X_HDMI_PADDR (A1X_PERIPH_PSECTION+A1X_HDMI_OFFSET) #define A1X_SPI2_PADDR (A1X_PERIPH_PSECTION+A1X_SPI2_OFFSET) -#define A1X_NC_PADDR (A1X_PERIPH_PSECTION+A1X_NC_OFFSET) #define A1X_PATA_PADDR (A1X_PERIPH_PSECTION+A1X_PATA_OFFSET) #define A1X_ACE_PADDR (A1X_PERIPH_PSECTION+A1X_ACE_OFFSET) #define A1X_TVE1_PADDR (A1X_PERIPH_PSECTION+A1X_TVE1_OFFSET) @@ -202,7 +199,6 @@ #define A1X_INTC_PADDR (A1X_PERIPH_PSECTION+A1X_INTC_OFFSET) #define A1X_PIO_PADDR (A1X_PERIPH_PSECTION+A1X_PIO_OFFSET) #define A1X_TIMER_PADDR (A1X_PERIPH_PSECTION+A1X_TIMER_OFFSET) -#define A1X_NC_PADDR (A1X_PERIPH_PSECTION+A1X_NC_OFFSET) #define A1X_AC97_PADDR (A1X_PERIPH_PSECTION+A1X_AC97_OFFSET) #define A1X_IR0_PADDR (A1X_PERIPH_PSECTION+A1X_IR0_OFFSET) #define A1X_IR1_PADDR (A1X_PERIPH_PSECTION+A1X_IR1_OFFSET) @@ -360,7 +356,6 @@ #define A1X_SS_VADDR (A1X_PERIPH_VSECTION+A1X_SS_OFFSET) #define A1X_HDMI_VADDR (A1X_PERIPH_VSECTION+A1X_HDMI_OFFSET) #define A1X_SPI2_VADDR (A1X_PERIPH_VSECTION+A1X_SPI2_OFFSET) -#define A1X_NC_VADDR (A1X_PERIPH_VSECTION+A1X_NC_OFFSET) #define A1X_PATA_VADDR (A1X_PERIPH_VSECTION+A1X_PATA_OFFSET) #define A1X_ACE_VADDR (A1X_PERIPH_VSECTION+A1X_ACE_OFFSET) #define A1X_TVE1_VADDR (A1X_PERIPH_VSECTION+A1X_TVE1_OFFSET) @@ -372,7 +367,6 @@ #define A1X_INTC_VADDR (A1X_PERIPH_VSECTION+A1X_INTC_OFFSET) #define A1X_PIO_VADDR (A1X_PERIPH_VSECTION+A1X_PIO_OFFSET) #define A1X_TIMER_VADDR (A1X_PERIPH_VSECTION+A1X_TIMER_OFFSET) -#define A1X_NC_VADDR (A1X_PERIPH_VSECTION+A1X_NC_OFFSET) #define A1X_AC97_VADDR (A1X_PERIPH_VSECTION+A1X_AC97_OFFSET) #define A1X_IR0_VADDR (A1X_PERIPH_VSECTION+A1X_IR0_OFFSET) #define A1X_IR1_VADDR (A1X_PERIPH_VSECTION+A1X_IR1_OFFSET) diff --git a/nuttx/configs/pcduino-a10/include/board.h b/nuttx/configs/pcduino-a10/include/board.h index 871e67eab..7b17bc0c0 100644 --- a/nuttx/configs/pcduino-a10/include/board.h +++ b/nuttx/configs/pcduino-a10/include/board.h @@ -124,10 +124,8 @@ #define BUTTON_KEY_MENU_BIT (1 << BUTTON_KEY_MENU) /* NAND *****************************************************************************/ -#warning Missing Logic -/* GPIO configuration ***************************************************************/ -#warning Missing Logic +/* GPIO pin disambiguation **********************************************************/ /************************************************************************************ * Assembly Language Macros diff --git a/nuttx/configs/pcduino-a10/src/pcduino_a10.h b/nuttx/configs/pcduino-a10/src/pcduino_a10.h index 17c142dce..fc853ebce 100644 --- a/nuttx/configs/pcduino-a10/src/pcduino_a10.h +++ b/nuttx/configs/pcduino-a10/src/pcduino_a10.h @@ -130,7 +130,6 @@ #endif /* SPI Chip Selects *****************************************************************/ -#warning Missing logic /************************************************************************************ * Public Types |