From 5de39ed3c9cf86e363c65e21f31d72f04dd1f87a Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Thu, 14 May 2015 12:25:09 -0600 Subject: [PATCH] Rename SAMD directories and configuration variables to SAMDL so that the same build environment can support the SAML --- configs/samd20-xplained/README.txt | 72 +++++++++---------- configs/samd20-xplained/nsh/defconfig | 66 ++++++++--------- configs/samd20-xplained/scripts/flash.ld | 2 +- configs/samd20-xplained/src/Makefile | 2 +- configs/samd20-xplained/src/sam_boot.c | 2 +- .../samd20-xplained/src/sam_cxxinitialize.c | 3 - configs/samd20-xplained/src/sam_mmcsd.c | 14 ++-- configs/samd20-xplained/src/sam_nsh.c | 12 ++-- configs/samd20-xplained/src/sam_spi.c | 42 +++++------ .../samd20-xplained/src/sam_ug2832hsweg04.c | 4 +- configs/teensy-lc/src/kl_cxxinitialize.c | 3 - 11 files changed, 108 insertions(+), 114 deletions(-) diff --git a/configs/samd20-xplained/README.txt b/configs/samd20-xplained/README.txt index 31037d1e1b..44281f1c3a 100644 --- a/configs/samd20-xplained/README.txt +++ b/configs/samd20-xplained/README.txt @@ -460,7 +460,7 @@ SAMD20 Xplained Pro-specific Configuration Options CONFIG_ARCH_CHIP - Identifies the arch/*/chip subdirectory - CONFIG_ARCH_CHIP="samd" + CONFIG_ARCH_CHIP="samdl" CONFIG_ARCH_CHIP_name - For use in C code to identify the exact chip: @@ -513,38 +513,38 @@ SAMD20 Xplained Pro-specific Configuration Options Individual subsystems can be enabled: - CONFIG_SAMD_WDT - Watchdog Timer" - CONFIG_SAMD_RTC - Real Time Counter" - CONFIG_SAMD_NVMCTRL - Non-Volatile Memory Controller" - CONFIG_SAMD_EVSYS - Event System" - CONFIG_SAMD_SERCOM0 - Serial Communication Interface 0" - CONFIG_SAMD_SERCOM1 - Serial Communication Interface 1" - CONFIG_SAMD_SERCOM2 - Serial Communication Interface 2" - CONFIG_SAMD_SERCOM3 - Serial Communication Interface 3" - CONFIG_SAMD_SERCOM4 - Serial Communication Interface 4" - CONFIG_SAMD_SERCOM5 - Serial Communication Interface 5" - CONFIG_SAMD_TC0 - Timer/Counter 0" - CONFIG_SAMD_TC1 - Timer/Counter 1" - CONFIG_SAMD_TC2 - Timer/Counter 2" - CONFIG_SAMD_TC3 - Timer/Counter 3" - CONFIG_SAMD_TC4 - Timer/Counter 4" - CONFIG_SAMD_TC5 - Timer/Counter 5" - CONFIG_SAMD_TC6 - Timer/Counter 6" - CONFIG_SAMD_TC7 - Timer/Counter 6" - CONFIG_SAMD_ADC - Analog-to-Digital Converter" - CONFIG_SAMD_AC - Analog Comparator" - CONFIG_SAMD_DAC - Digital-to-Analog Converter" - CONFIG_SAMD_PTC - Peripheral Touch Controller" + CONFIG_SAMDL_WDT - Watchdog Timer" + CONFIG_SAMDL_RTC - Real Time Counter" + CONFIG_SAMDL_NVMCTRL - Non-Volatile Memory Controller" + CONFIG_SAMDL_EVSYS - Event System" + CONFIG_SAMDL_SERCOM0 - Serial Communication Interface 0" + CONFIG_SAMDL_SERCOM1 - Serial Communication Interface 1" + CONFIG_SAMDL_SERCOM2 - Serial Communication Interface 2" + CONFIG_SAMDL_SERCOM3 - Serial Communication Interface 3" + CONFIG_SAMDL_SERCOM4 - Serial Communication Interface 4" + CONFIG_SAMDL_SERCOM5 - Serial Communication Interface 5" + CONFIG_SAMDL_TC0 - Timer/Counter 0" + CONFIG_SAMDL_TC1 - Timer/Counter 1" + CONFIG_SAMDL_TC2 - Timer/Counter 2" + CONFIG_SAMDL_TC3 - Timer/Counter 3" + CONFIG_SAMDL_TC4 - Timer/Counter 4" + CONFIG_SAMDL_TC5 - Timer/Counter 5" + CONFIG_SAMDL_TC6 - Timer/Counter 6" + CONFIG_SAMDL_TC7 - Timer/Counter 6" + CONFIG_SAMDL_ADC - Analog-to-Digital Converter" + CONFIG_SAMDL_AC - Analog Comparator" + CONFIG_SAMDL_DAC - Digital-to-Analog Converter" + CONFIG_SAMDL_PTC - Peripheral Touch Controller" Some subsystems can be configured to operate in different ways. The drivers need to know how to configure the subsystem. - CONFIG_SAMD_SERCOM0_ISI2C, CONFIG_SAMD_SERCOM0_ISSPI, or CONFIG_SAMD_SERCOM0_ISUSART - CONFIG_SAMD_SERCOM1_ISI2C, CONFIG_SAMD_SERCOM1_ISSPI, or CONFIG_SAMD_SERCOM1_ISUSART - CONFIG_SAMD_SERCOM2_ISI2C, CONFIG_SAMD_SERCOM2_ISSPI, or CONFIG_SAMD_SERCOM2_ISUSART - CONFIG_SAMD_SERCOM3_ISI2C, CONFIG_SAMD_SERCOM3_ISSPI, or CONFIG_SAMD_SERCOM3_ISUSART - CONFIG_SAMD_SERCOM4_ISI2C, CONFIG_SAMD_SERCOM4_ISSPI, or CONFIG_SAMD_SERCOM4_ISUSART - CONFIG_SAMD_SERCOM5_ISI2C, CONFIG_SAMD_SERCOM5_ISSPI, or CONFIG_SAMD_SERCOM5_ISUSART + CONFIG_SAMDL_SERCOM0_ISI2C, CONFIG_SAMDL_SERCOM0_ISSPI, or CONFIG_SAMDL_SERCOM0_ISUSART + CONFIG_SAMDL_SERCOM1_ISI2C, CONFIG_SAMDL_SERCOM1_ISSPI, or CONFIG_SAMDL_SERCOM1_ISUSART + CONFIG_SAMDL_SERCOM2_ISI2C, CONFIG_SAMDL_SERCOM2_ISSPI, or CONFIG_SAMDL_SERCOM2_ISUSART + CONFIG_SAMDL_SERCOM3_ISI2C, CONFIG_SAMDL_SERCOM3_ISSPI, or CONFIG_SAMDL_SERCOM3_ISUSART + CONFIG_SAMDL_SERCOM4_ISI2C, CONFIG_SAMDL_SERCOM4_ISSPI, or CONFIG_SAMDL_SERCOM4_ISUSART + CONFIG_SAMDL_SERCOM5_ISI2C, CONFIG_SAMDL_SERCOM5_ISSPI, or CONFIG_SAMDL_SERCOM5_ISUSART SAT91SAMD20 specific device driver settings @@ -608,9 +608,9 @@ Configurations be used, instead, by reconfiguring to use SERCOM3 instead of SERCOM4: - System Type -> SAMD Peripheral Support - CONFIG_SAMD_SERCOM3=y : Enable one or both - CONFIG_SAMD_SERCOM4=n + System Type -> SAMD/L Peripheral Support + CONFIG_SAMDL_SERCOM3=y : Enable one or both + CONFIG_SAMDL_SERCOM4=n Device Drivers -> Serial Driver Support -> Serial Console CONFIG_USART4_SERIAL_CONSOLE=y : Select only one for the console @@ -717,8 +717,8 @@ Configuration sub-directories details. System Type -> Peripherals: - CONFIG_SAMD_SERCOM0=y : Use SERCOM0 if the I/O is in EXT1 - CONFIG_SAMD_SERCOM0_ISSPI=y : Configure SERCOM0 as an SPI master + CONFIG_SAMDL_SERCOM0=y : Use SERCOM0 if the I/O is in EXT1 + CONFIG_SAMDL_SERCOM0_ISSPI=y : Configure SERCOM0 as an SPI master Device Drivers CONFIG_SPI=y : Enable SPI support @@ -778,8 +778,8 @@ Configuration sub-directories EXT3: SPI is provided through SERCOM5 System Type -> Peripherals: - CONFIG_SAMD_SERCOM1=y : Use SERCOM1 if the I/O is in EXT2 - CONFIG_SAMD_SERCOM1_ISSPI=y : Configure SERCOM1 as an SPI master + CONFIG_SAMDL_SERCOM1=y : Use SERCOM1 if the I/O is in EXT2 + CONFIG_SAMDL_SERCOM1_ISSPI=y : Configure SERCOM1 as an SPI master Device Drivers -> SPI CONFIG_SPI=y : Enable SPI support diff --git a/configs/samd20-xplained/nsh/defconfig b/configs/samd20-xplained/nsh/defconfig index 987da85c50..e82faacec2 100644 --- a/configs/samd20-xplained/nsh/defconfig +++ b/configs/samd20-xplained/nsh/defconfig @@ -98,7 +98,7 @@ CONFIG_ARCH_CORTEXM0=y # CONFIG_ARCH_CORTEXA5 is not set # CONFIG_ARCH_CORTEXA8 is not set CONFIG_ARCH_FAMILY="armv6-m" -CONFIG_ARCH_CHIP="samd" +CONFIG_ARCH_CHIP="samdl" CONFIG_ARCH_HAVE_CMNVECTOR=y # CONFIG_ARMV7M_CMNVECTOR is not set # CONFIG_ARCH_HAVE_FPU is not set @@ -137,42 +137,42 @@ CONFIG_ARCH_FAMILY_SAMD20=y # CONFIG_ARCH_FAMILY_SAMD20E is not set # CONFIG_ARCH_FAMILY_SAMD20G is not set CONFIG_ARCH_FAMILY_SAMD20J=y -CONFIG_SAMD_HAVE_SERCOM4=y -CONFIG_SAMD_HAVE_SERCOM5=y -CONFIG_SAMD_HAVE_TC6=y -CONFIG_SAMD_HAVE_TC7=y +CONFIG_SAMDL_HAVE_SERCOM4=y +CONFIG_SAMDL_HAVE_SERCOM5=y +CONFIG_SAMDL_HAVE_TC6=y +CONFIG_SAMDL_HAVE_TC7=y # # SAMD Peripheral Support # -# CONFIG_SAMD_WDT is not set -# CONFIG_SAMD_RTC is not set -# CONFIG_SAMD_NVMCTRL is not set -# CONFIG_SAMD_EVSYS is not set -# CONFIG_SAMD_SERCOM0 is not set -# CONFIG_SAMD_SERCOM1 is not set -# CONFIG_SAMD_SERCOM2 is not set -CONFIG_SAMD_SERCOM3=y -CONFIG_SAMD_SERCOM4=y -# CONFIG_SAMD_SERCOM5 is not set -# CONFIG_SAMD_TC0 is not set -# CONFIG_SAMD_TC1 is not set -# CONFIG_SAMD_TC2 is not set -# CONFIG_SAMD_TC3 is not set -# CONFIG_SAMD_TC4 is not set -# CONFIG_SAMD_TC5 is not set -# CONFIG_SAMD_TC6 is not set -# CONFIG_SAMD_TC7 is not set -# CONFIG_SAMD_ADC is not set -# CONFIG_SAMD_AC is not set -# CONFIG_SAMD_DAC is not set -# CONFIG_SAMD_PTC is not set -# CONFIG_SAMD_SERCOM3_ISI2C is not set -# CONFIG_SAMD_SERCOM3_ISSPI is not set -CONFIG_SAMD_SERCOM3_ISUSART=y -# CONFIG_SAMD_SERCOM4_ISI2C is not set -# CONFIG_SAMD_SERCOM4_ISSPI is not set -CONFIG_SAMD_SERCOM4_ISUSART=y +# CONFIG_SAMDL_WDT is not set +# CONFIG_SAMDL_RTC is not set +# CONFIG_SAMDL_NVMCTRL is not set +# CONFIG_SAMDL_EVSYS is not set +# CONFIG_SAMDL_SERCOM0 is not set +# CONFIG_SAMDL_SERCOM1 is not set +# CONFIG_SAMDL_SERCOM2 is not set +CONFIG_SAMDL_SERCOM3=y +CONFIG_SAMDL_SERCOM4=y +# CONFIG_SAMDL_SERCOM5 is not set +# CONFIG_SAMDL_TC0 is not set +# CONFIG_SAMDL_TC1 is not set +# CONFIG_SAMDL_TC2 is not set +# CONFIG_SAMDL_TC3 is not set +# CONFIG_SAMDL_TC4 is not set +# CONFIG_SAMDL_TC5 is not set +# CONFIG_SAMDL_TC6 is not set +# CONFIG_SAMDL_TC7 is not set +# CONFIG_SAMDL_ADC is not set +# CONFIG_SAMDL_AC is not set +# CONFIG_SAMDL_DAC is not set +# CONFIG_SAMDL_PTC is not set +# CONFIG_SAMDL_SERCOM3_ISI2C is not set +# CONFIG_SAMDL_SERCOM3_ISSPI is not set +CONFIG_SAMDL_SERCOM3_ISUSART=y +# CONFIG_SAMDL_SERCOM4_ISI2C is not set +# CONFIG_SAMDL_SERCOM4_ISSPI is not set +CONFIG_SAMDL_SERCOM4_ISUSART=y # # Architecture Options diff --git a/configs/samd20-xplained/scripts/flash.ld b/configs/samd20-xplained/scripts/flash.ld index 197cbf9c7a..849f6ff572 100755 --- a/configs/samd20-xplained/scripts/flash.ld +++ b/configs/samd20-xplained/scripts/flash.ld @@ -1,5 +1,5 @@ /**************************************************************************** - * configs/samd30-xplained/scripts/flash.ld + * configs/samd20-xplained/scripts/flash.ld * * Copyright (C) 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/configs/samd20-xplained/src/Makefile b/configs/samd20-xplained/src/Makefile index 75fa61457c..66aef7fafc 100644 --- a/configs/samd20-xplained/src/Makefile +++ b/configs/samd20-xplained/src/Makefile @@ -46,7 +46,7 @@ ifeq ($(CONFIG_HAVE_CXX),y) CSRCS += sam_cxxinitialize.c endif -ifeq ($(CONFIG_SAMD_SERCOM0),y) +ifeq ($(CONFIG_SAMDL_SERCOM0),y) CSRCS += sam_spi.c endif diff --git a/configs/samd20-xplained/src/sam_boot.c b/configs/samd20-xplained/src/sam_boot.c index 0290cee10a..78a58f164b 100644 --- a/configs/samd20-xplained/src/sam_boot.c +++ b/configs/samd20-xplained/src/sam_boot.c @@ -74,7 +74,7 @@ void sam_boardinitialize(void) * sam_spiinitialize() has been brought into the link. */ -#ifdef SAMD_HAVE_SPI +#ifdef SAMDL_HAVE_SPI if (sam_spiinitialize) { sam_spiinitialize(); diff --git a/configs/samd20-xplained/src/sam_cxxinitialize.c b/configs/samd20-xplained/src/sam_cxxinitialize.c index d0a195e824..1086ca140f 100644 --- a/configs/samd20-xplained/src/sam_cxxinitialize.c +++ b/configs/samd20-xplained/src/sam_cxxinitialize.c @@ -43,9 +43,6 @@ #include -#include -#include "chip.h" - #if defined(CONFIG_HAVE_CXX) && defined(CONFIG_HAVE_CXXINITIALIZE) /************************************************************************************ diff --git a/configs/samd20-xplained/src/sam_mmcsd.c b/configs/samd20-xplained/src/sam_mmcsd.c index 666b173e7c..f9b61b3ae8 100644 --- a/configs/samd20-xplained/src/sam_mmcsd.c +++ b/configs/samd20-xplained/src/sam_mmcsd.c @@ -60,7 +60,7 @@ # error Mountpoints are disabled (CONFIG_DISABLE_MOUNTPOINT=y) #endif -#ifndef SAMD_HAVE_SPI0 +#ifndef SAMDL_HAVE_SPI0 # error SERCOM0 SPI support is required #endif @@ -68,7 +68,7 @@ # error MMC/SD support is required (CONFIG_MMCSD) #endif -#define SAMD_MMCSDSLOTNO 0 /* There is only one slot */ +#define SAMDL_MMCSDSLOTNO 0 /* There is only one slot */ /**************************************************************************** * Public Functions @@ -82,7 +82,7 @@ * - CONFIG_SAMD20_XPLAINED_IOMODULE=y, * - CONFIG_DISABLE_MOUNTPOINT=n, * - CONFIG_MMCSD=y, and - * - SAMD_HAVE_SPI0=y (CONFIG_SAMD_SERCOM0 && CONFIG_SAMD_SERCOM0_ISSPI) + * - SAMDL_HAVE_SPI0=y (CONFIG_SAMDL_SERCOM0 && CONFIG_SAMDL_SERCOM0_ISSPI) * *****************************************************************************/ @@ -106,18 +106,18 @@ int sam_sdinitialize(int port, int minor) /* Bind the SPI device for the chip select to the slot */ - fvdbg("Binding SPI%d to MMC/SD slot %d\n", port, SAMD_MMCSDSLOTNO); + fvdbg("Binding SPI%d to MMC/SD slot %d\n", port, SAMDL_MMCSDSLOTNO); - ret = mmcsd_spislotinitialize(minor, SAMD_MMCSDSLOTNO, spi); + ret = mmcsd_spislotinitialize(minor, SAMDL_MMCSDSLOTNO, spi); if (ret < 0) { fdbg("Failed to bind SPI%d to MMC/SD slot %d: %d\n", - port, SAMD_MMCSDSLOTNO, ret); + port, SAMDL_MMCSDSLOTNO, ret); return ret; } fvdbg("Successfuly bound SPI%d to MMC/SD slot %d\n", - port, SAMD_MMCSDSLOTNO); + port, SAMDL_MMCSDSLOTNO); return OK; } diff --git a/configs/samd20-xplained/src/sam_nsh.c b/configs/samd20-xplained/src/sam_nsh.c index 377d9da40f..0f5480c79d 100644 --- a/configs/samd20-xplained/src/sam_nsh.c +++ b/configs/samd20-xplained/src/sam_nsh.c @@ -53,7 +53,7 @@ /* Some configuration checks */ #ifdef CONFIG_SAMD20_XPLAINED_IOMODULE_EXT1 -# ifndef SAMD_HAVE_SPI0 +# ifndef SAMDL_HAVE_SPI0 # error I/O1 module on EXT1 requires SERCOM SPI0 # undef CONFIG_SAMD20_XPLAINED_IOMODULE # endif @@ -61,7 +61,7 @@ #endif #ifdef CONFIG_SAMD20_XPLAINED_IOMODULE_EXT2 -# ifndef SAMD_HAVE_SPI1 +# ifndef SAMDL_HAVE_SPI1 # error I/O1 module on EXT2 requires SERCOM SPI1 # undef CONFIG_SAMD20_XPLAINED_IOMODULE # endif @@ -72,12 +72,12 @@ /* Support for the SD card slot on the I/O1 module */ /* Verify NSH PORT and SLOT settings */ -# define SAMD_MMCSDSLOTNO 0 /* There is only one slot */ +# define SAMDL_MMCSDSLOTNO 0 /* There is only one slot */ -# if defined(CONFIG_NSH_MMCSDSLOTNO) && CONFIG_NSH_MMCSDSLOTNO != SAMD_MMCSDSLOTNO +# if defined(CONFIG_NSH_MMCSDSLOTNO) && CONFIG_NSH_MMCSDSLOTNO != SAMDL_MMCSDSLOTNO # error Only one MMC/SD slot: Slot 0 (CONFIG_NSH_MMCSDSLOTNO) # undef CONFIG_NSH_MMCSDSLOTNO -# define CONFIG_NSH_MMCSDSLOTNO SAMD_MMCSDSLOTNO +# define CONFIG_NSH_MMCSDSLOTNO SAMDL_MMCSDSLOTNO # endif # if defined(CONFIG_NSH_MMCSDSPIPORTNO) && CONFIG_NSH_MMCSDSPIPORTNO != SPI_PORTNO @@ -107,7 +107,7 @@ int board_app_initialize(void) { -#if defined(SAMD_HAVE_SPI0) && defined(CONFIG_SAMD20_XPLAINED_IOMODULE) +#if defined(SAMDL_HAVE_SPI0) && defined(CONFIG_SAMD20_XPLAINED_IOMODULE) /* Initialize the SPI-based MMC/SD slot */ { diff --git a/configs/samd20-xplained/src/sam_spi.c b/configs/samd20-xplained/src/sam_spi.c index e13f19395f..04e3e731ea 100644 --- a/configs/samd20-xplained/src/sam_spi.c +++ b/configs/samd20-xplained/src/sam_spi.c @@ -51,7 +51,7 @@ #include "samd20-xplained.h" -#ifdef SAMD_HAVE_SPI +#ifdef SAMDL_HAVE_SPI /**************************************************************************** * Pre-processor Definitions @@ -129,7 +129,7 @@ void weak_function sam_spiinitialize(void) * o sam_spi[n]status and sam_spi[n]cmddata: Implementations of the status * and cmddata methods of the SPI interface defined by struct spi_ops_ * (see include/nuttx/spi/spi.h). All other methods including - * up_spiinitialize()) are provided by common SAMD logic. + * up_spiinitialize()) are provided by common SAMD/L logic. * * Where [n] is the SERCOM number for the SPI module. * @@ -179,7 +179,7 @@ void weak_function sam_spiinitialize(void) * ****************************************************************************/ -#ifdef SAMD_HAVE_SPI0 +#ifdef SAMDL_HAVE_SPI0 void sam_spi0select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected) { @@ -207,7 +207,7 @@ void sam_spi0select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, } #endif -#ifdef SAMD_HAVE_SPI1 +#ifdef SAMDL_HAVE_SPI1 void sam_spi1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected) { @@ -235,28 +235,28 @@ void sam_spi1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, } #endif -#ifdef SAMD_HAVE_SPI2 +#ifdef SAMDL_HAVE_SPI2 void sam_spi2select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected) { } #endif -#ifdef SAMD_HAVE_SPI3 +#ifdef SAMDL_HAVE_SPI3 void sam_spi3select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected) { } #endif -#ifdef SAMD_HAVE_SPI4 +#ifdef SAMDL_HAVE_SPI4 void sam_spi4select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected) { } #endif -#ifdef SAMD_HAVE_SPI5 +#ifdef SAMDL_HAVE_SPI5 void sam_spi5select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected) { @@ -278,7 +278,7 @@ void sam_spi5select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, * ****************************************************************************/ -#ifdef SAMD_HAVE_SPI0 +#ifdef SAMDL_HAVE_SPI0 uint8_t sam_spi0status(FAR struct spi_dev_s *dev, enum spi_dev_e devid) { uint8_t ret = 0; @@ -301,7 +301,7 @@ uint8_t sam_spi0status(FAR struct spi_dev_s *dev, enum spi_dev_e devid) } #endif -#ifdef SAMD_HAVE_SPI1 +#ifdef SAMDL_HAVE_SPI1 uint8_t sam_spi1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid) { uint8_t ret = 0; @@ -324,28 +324,28 @@ uint8_t sam_spi1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid) } #endif -#ifdef SAMD_HAVE_SPI2 +#ifdef SAMDL_HAVE_SPI2 uint8_t sam_spi2status(FAR struct spi_dev_s *dev, enum spi_dev_e devid) { return 0; } #endif -#ifdef SAMD_HAVE_SPI3 +#ifdef SAMDL_HAVE_SPI3 uint8_t sam_spi3status(FAR struct spi_dev_s *dev, enum spi_dev_e devid) { return 0; } #endif -#ifdef SAMD_HAVE_SPI4 +#ifdef SAMDL_HAVE_SPI4 uint8_t sam_spi4status(FAR struct spi_dev_s *dev, enum spi_dev_e devid) { return 0; } #endif -#ifdef SAMD_HAVE_SPI5 +#ifdef SAMDL_HAVE_SPI5 uint8_t sam_spi5status(FAR struct spi_dev_s *dev, enum spi_dev_e devid) { uint8_t ret = 0; @@ -378,7 +378,7 @@ uint8_t sam_spi5status(FAR struct spi_dev_s *dev, enum spi_dev_e devid) ****************************************************************************/ #ifdef CONFIG_SPI_CMDDATA -#ifdef SAMD_HAVE_SPI0 +#ifdef SAMDL_HAVE_SPI0 int sam_spi0cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd) { #ifdef CONFIG_SAMD20_XPLAINED_OLED1MODULE_EXT1 @@ -399,7 +399,7 @@ int sam_spi0cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd) } #endif -#ifdef SAMD_HAVE_SPI1 +#ifdef SAMDL_HAVE_SPI1 int sam_spi1cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd) { #ifdef CONFIG_SAMD20_XPLAINED_OLED1MODULE_EXT2 @@ -420,28 +420,28 @@ int sam_spi1cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd) } #endif -#ifdef SAMD_HAVE_SPI2 +#ifdef SAMDL_HAVE_SPI2 int sam_spi2cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd) { return OK; } #endif -#ifdef SAMD_HAVE_SPI3 +#ifdef SAMDL_HAVE_SPI3 int sam_spi3cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd) { return OK; } #endif -#ifdef SAMD_HAVE_SPI4 +#ifdef SAMDL_HAVE_SPI4 int sam_spi4cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd) { return OK; } #endif -#ifdef SAMD_HAVE_SPI5 +#ifdef SAMDL_HAVE_SPI5 int sam_spi5cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd) { return OK; @@ -449,4 +449,4 @@ int sam_spi5cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd) #endif #endif /* CONFIG_SPI_CMDDATA */ -#endif /* SAMD_HAVE_SPI */ +#endif /* SAMDL_HAVE_SPI */ diff --git a/configs/samd20-xplained/src/sam_ug2832hsweg04.c b/configs/samd20-xplained/src/sam_ug2832hsweg04.c index f3af916cde..d3ec794d1a 100644 --- a/configs/samd20-xplained/src/sam_ug2832hsweg04.c +++ b/configs/samd20-xplained/src/sam_ug2832hsweg04.c @@ -134,8 +134,8 @@ # error "The OLED driver requires CONFIG_LCD_UG2832HSWEG04 in the configuration" #endif -#ifndef SAMD_HAVE_SPI0 -# error "The OLED driver requires SAMD_HAVE_SPI0 in the configuration" +#ifndef SAMDL_HAVE_SPI0 +# error "The OLED driver requires SAMDL_HAVE_SPI0 in the configuration" #endif #ifndef CONFIG_SPI_CMDDATA diff --git a/configs/teensy-lc/src/kl_cxxinitialize.c b/configs/teensy-lc/src/kl_cxxinitialize.c index e4c31e1b91..66e498c813 100644 --- a/configs/teensy-lc/src/kl_cxxinitialize.c +++ b/configs/teensy-lc/src/kl_cxxinitialize.c @@ -43,9 +43,6 @@ #include -#include -#include "chip.h" - #if defined(CONFIG_HAVE_CXX) && defined(CONFIG_HAVE_CXXINITIALIZE) /************************************************************************************