From d34b1b620b95c6e1be61ed8e37ce546a7f3b0cbb Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Tue, 25 Feb 2014 12:41:38 -0600 Subject: [PATCH] SAM3/4: Fix some build errors that crept in with the SAM4E support --- arch/arm/src/sam34/sam_gpio.c | 5 ++--- arch/arm/src/sam34/sam_lowputc.c | 2 +- arch/arm/src/sam34/sam_serial.c | 2 +- configs/sam3u-ek/src/up_lcd.c | 4 ++-- configs/sam4s-xplained/src/sam_sram.c | 2 +- 5 files changed, 7 insertions(+), 8 deletions(-) diff --git a/arch/arm/src/sam34/sam_gpio.c b/arch/arm/src/sam34/sam_gpio.c index f16432ca251..da581eed19f 100644 --- a/arch/arm/src/sam34/sam_gpio.c +++ b/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/arch/arm/src/sam34/sam_lowputc.c b/arch/arm/src/sam34/sam_lowputc.c index 63021309c2e..6fffac4a76d 100644 --- a/arch/arm/src/sam34/sam_lowputc.c +++ b/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/arch/arm/src/sam34/sam_serial.c b/arch/arm/src/sam34/sam_serial.c index 62805922ee7..7420a4679c7 100644 --- a/arch/arm/src/sam34/sam_serial.c +++ b/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/configs/sam3u-ek/src/up_lcd.c b/configs/sam3u-ek/src/up_lcd.c index 780abe04904..393e41f5284 100644 --- a/configs/sam3u-ek/src/up_lcd.c +++ b/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/configs/sam4s-xplained/src/sam_sram.c b/configs/sam4s-xplained/src/sam_sram.c index 51a193e333d..b96cf07d6ff 100644 --- a/configs/sam4s-xplained/src/sam_sram.c +++ b/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