diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2014-02-25 12:41:38 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2014-02-25 12:41:38 -0600 |
| commit | 3c64ebf3e5647fe1b6711f734b465f055bec022e (patch) | |
| tree | e1f4cdf1769e3ba23511177aab716f2408db0ea1 /nuttx | |
| parent | 72ed2003913a3439b5e4d5f4424fa2b89c355cea (diff) | |
| download | px4-nuttx-3c64ebf3e5647fe1b6711f734b465f055bec022e.tar.gz px4-nuttx-3c64ebf3e5647fe1b6711f734b465f055bec022e.tar.bz2 px4-nuttx-3c64ebf3e5647fe1b6711f734b465f055bec022e.zip | |
SAM3/4: Fix some build errors that crept in with the SAM4E support
Diffstat (limited to 'nuttx')
| -rw-r--r-- | nuttx/arch/arm/src/sam34/sam_gpio.c | 5 | ||||
| -rw-r--r-- | nuttx/arch/arm/src/sam34/sam_lowputc.c | 2 | ||||
| -rw-r--r-- | nuttx/arch/arm/src/sam34/sam_serial.c | 2 | ||||
| -rw-r--r-- | nuttx/configs/sam3u-ek/src/up_lcd.c | 4 | ||||
| -rw-r--r-- | nuttx/configs/sam4s-xplained/src/sam_sram.c | 2 |
5 files changed, 7 insertions, 8 deletions
diff --git a/nuttx/arch/arm/src/sam34/sam_gpio.c b/nuttx/arch/arm/src/sam34/sam_gpio.c index f16432ca2..da581eed1 100644 --- a/nuttx/arch/arm/src/sam34/sam_gpio.c +++ b/nuttx/arch/arm/src/sam34/sam_gpio.c @@ -522,13 +522,13 @@ int sam_dumpgpio(uint32_t pinset, const char *msg) lldbg(" FRLHSR: %08x LOCKSR: %08x WPMR: %08x WPSR: %08x\n", getreg32(base + SAM_PIO_FRLHSR_OFFSET), getreg32(base + SAM_PIO_LOCKSR_OFFSET), getreg32(base + SAM_PIO_WPMR_OFFSET), getreg32(base + SAM_PIO_WPSR_OFFSET)); -#elif defined(CONFIG_ARCH_CHIP_SAM4S) || defined(CONFIG_ARCH_CHIP_SAM4E) +#if defined(CONFIG_ARCH_CHIP_SAM4S) || defined(CONFIG_ARCH_CHIP_SAM4E) lldbg(" PCMR: %08x PCIMR: %08x PCISR: %08x PCRHR: %08x\n", getreg32(base + SAM_PIO_PCMR_OFFSET), getreg32(base + SAM_PIO_PCIMR_OFFSET), getreg32(base + SAM_PIO_PCISR_OFFSET), getreg32(base + SAM_PIO_PCRHR_OFFSET)); #ifdef CONFIG_ARCH_CHIP_SAM4E lldbg("SCHMITT: %08x DELAYR:%08x\n", - getreg32(base + SAM_PIO_SCHMITT_OFFSET)); + getreg32(base + SAM_PIO_SCHMITT_OFFSET), getreg32(base + SAM_PIO_DELAY_OFFSET)); #else lldbg("SCHMITT: %08x\n", getreg32(base + SAM_PIO_SCHMITT_OFFSET)); @@ -538,4 +538,3 @@ int sam_dumpgpio(uint32_t pinset, const char *msg) return OK; } #endif - diff --git a/nuttx/arch/arm/src/sam34/sam_lowputc.c b/nuttx/arch/arm/src/sam34/sam_lowputc.c index 63021309c..6fffac4a7 100644 --- a/nuttx/arch/arm/src/sam34/sam_lowputc.c +++ b/nuttx/arch/arm/src/sam34/sam_lowputc.c @@ -151,7 +151,7 @@ */ #if defined(CONFIG_ARCH_CHIP_SAM3U) || defined(CONFIG_ARCH_CHIP_SAM3X) || \ - defined(CONFIG_ARCH_CHIP_SAM3A) || defined(CONFIG_ARCH_CHIP_SAM4S) || \\ + defined(CONFIG_ARCH_CHIP_SAM3A) || defined(CONFIG_ARCH_CHIP_SAM4S) || \ defined(CONFIG_ARCH_CHIP_SAM4E) # define SAM_MR_USCLKS UART_MR_USCLKS_MCK /* Source = Main clock */ # define SAM_USART_CLOCK BOARD_MCK_FREQUENCY /* Frequency of the main clock */ diff --git a/nuttx/arch/arm/src/sam34/sam_serial.c b/nuttx/arch/arm/src/sam34/sam_serial.c index 62805922e..7420a4679 100644 --- a/nuttx/arch/arm/src/sam34/sam_serial.c +++ b/nuttx/arch/arm/src/sam34/sam_serial.c @@ -320,7 +320,7 @@ */ #if defined(CONFIG_ARCH_CHIP_SAM3U) || defined(CONFIG_ARCH_CHIP_SAM3X) || \ - defined(CONFIG_ARCH_CHIP_SAM3A) || defined(CONFIG_ARCH_CHIP_SAM4S) || \\ + defined(CONFIG_ARCH_CHIP_SAM3A) || defined(CONFIG_ARCH_CHIP_SAM4S) || \ defined(CONFIG_ARCH_CHIP_SAM4E) # define SAM_MR_USCLKS UART_MR_USCLKS_MCK /* Source = Main clock */ # define SAM_USART_CLOCK BOARD_MCK_FREQUENCY /* Frequency of the main clock */ diff --git a/nuttx/configs/sam3u-ek/src/up_lcd.c b/nuttx/configs/sam3u-ek/src/up_lcd.c index 780abe049..393e41f52 100644 --- a/nuttx/configs/sam3u-ek/src/up_lcd.c +++ b/nuttx/configs/sam3u-ek/src/up_lcd.c @@ -125,8 +125,8 @@ #include "up_arch.h" #include "sam_gpio.h" -#include "chip/sam3u_pmc.h" -#include "chip/sam3u_smc.h" +#include "chip/sam_pmc.h" +#include "chip/sam_smc.h" #include "sam3u-ek.h" /************************************************************************************** diff --git a/nuttx/configs/sam4s-xplained/src/sam_sram.c b/nuttx/configs/sam4s-xplained/src/sam_sram.c index 51a193e33..b96cf07d6 100644 --- a/nuttx/configs/sam4s-xplained/src/sam_sram.c +++ b/nuttx/configs/sam4s-xplained/src/sam_sram.c @@ -43,7 +43,7 @@ #include "up_arch.h" #include "sam4s_periphclks.h" -#include "chip/sam3u_smc.h" +#include "chip/sam_smc.h" #include "sam4s-xplained.h" #ifdef CONFIG_SAM34_EXTSRAM0 |