diff --git a/configs/stm32f103-minimum/rfid-rc522/defconfig b/configs/stm32f103-minimum/rfid-rc522/defconfig index 6a74dc01de7..0f41c12085e 100644 --- a/configs/stm32f103-minimum/rfid-rc522/defconfig +++ b/configs/stm32f103-minimum/rfid-rc522/defconfig @@ -697,6 +697,7 @@ CONFIG_ARCH_HAVE_SPI_BITORDER=y # Timer Driver Support # # CONFIG_TIMER is not set +# CONFIG_ONESHOT is not set # CONFIG_RTC is not set # CONFIG_WATCHDOG is not set # CONFIG_ANALOG is not set @@ -787,16 +788,12 @@ CONFIG_USART1_2STOP=0 # CONFIG_USBDEV is not set # CONFIG_USBHOST is not set # CONFIG_HAVE_USBTRACE is not set -CONFIG_DRIVERS_WIRELESS=y -# CONFIG_WL_CC1101 is not set -# CONFIG_WL_CC3000 is not set -# CONFIG_WL_NRF24L01 is not set +# CONFIG_DRIVERS_WIRELESS is not set +CONFIG_DRIVERS_CONTACTLESS=y CONFIG_CL_MFRC522=y CONFIG_MFRC522_SPI_FREQ=1000000 -CONFIG_MFRC522_DEBUG=y -# CONFIG_MFRC522_DEBUG_TX is not set -# CONFIG_MFRC522_DEBUG_RX is not set -# CONFIG_WL_PN532 is not set +# CONFIG_CL_MFRC522_DEBUG is not set +# CONFIG_CL_PN532 is not set # # System Logging @@ -965,10 +962,10 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024 # CONFIG_EXAMPLES_NRF24L01TERM is not set CONFIG_EXAMPLES_NSH=y # CONFIG_EXAMPLES_NULL is not set -# CONFIG_EXAMPLES_NX is not set # CONFIG_EXAMPLES_NXFFS is not set # CONFIG_EXAMPLES_NXHELLO is not set # CONFIG_EXAMPLES_NXIMAGE is not set +# CONFIG_EXAMPLES_NX is not set # CONFIG_EXAMPLES_NXLINES is not set # CONFIG_EXAMPLES_NXTERM is not set # CONFIG_EXAMPLES_NXTEXT is not set @@ -1019,6 +1016,7 @@ CONFIG_EXAMPLES_RFID_READUID_STACKSIZE=2048 # # CONFIG_INTERPRETERS_FICL is not set # CONFIG_INTERPRETERS_MICROPYTHON is not set +# CONFIG_INTERPRETERS_MINIBASIC is not set # CONFIG_INTERPRETERS_PCODE is not set # @@ -1090,6 +1088,7 @@ CONFIG_NSH_DISABLE_LOSMART=y # CONFIG_NSH_DISABLE_MOUNT is not set # CONFIG_NSH_DISABLE_MV is not set # CONFIG_NSH_DISABLE_MW is not set +CONFIG_NSH_DISABLE_PRINTF=y # CONFIG_NSH_DISABLE_PS is not set # CONFIG_NSH_DISABLE_PUT is not set # CONFIG_NSH_DISABLE_PWD is not set @@ -1156,6 +1155,8 @@ CONFIG_READLINE_ECHO=y # CONFIG_READLINE_TABCOMPLETION is not set # CONFIG_READLINE_CMD_HISTORY is not set # CONFIG_SYSTEM_SUDOKU is not set +# CONFIG_SYSTEM_SYSTEM is not set +# CONFIG_SYSTEM_TEE is not set # CONFIG_SYSTEM_UBLOXMODEM is not set # CONFIG_SYSTEM_VI is not set # CONFIG_SYSTEM_ZMODEM is not set diff --git a/configs/stm32f103-minimum/src/Makefile b/configs/stm32f103-minimum/src/Makefile index c502b43a47f..746f20edbcb 100644 --- a/configs/stm32f103-minimum/src/Makefile +++ b/configs/stm32f103-minimum/src/Makefile @@ -53,7 +53,7 @@ ifeq ($(CONFIG_AUDIO_TONE),y) CSRCS += stm32_tone.c endif -ifeq ($(CONFIG_CL_MRFC522),y) +ifeq ($(CONFIG_CL_MFRC522),y) CSRCS += stm32_mfrc522.c endif diff --git a/configs/stm32f103-minimum/src/stm32_bringup.c b/configs/stm32f103-minimum/src/stm32_bringup.c index 016e7149bd8..2843f67e5b0 100644 --- a/configs/stm32f103-minimum/src/stm32_bringup.c +++ b/configs/stm32f103-minimum/src/stm32_bringup.c @@ -112,7 +112,7 @@ int stm32_bringup(void) } #endif -#ifdef CONFIG_CL_MRFC522 +#ifdef CONFIG_CL_MFRC522 ret = stm32_mfrc522initialize("/dev/rfid0"); if (ret < 0) { diff --git a/configs/stm32f103-minimum/src/stm32_spi.c b/configs/stm32f103-minimum/src/stm32_spi.c index 10aabe207c1..98593be3ca5 100644 --- a/configs/stm32f103-minimum/src/stm32_spi.c +++ b/configs/stm32f103-minimum/src/stm32_spi.c @@ -74,7 +74,7 @@ void stm32_spidev_initialize(void) * architecture. */ -#ifdef CONFIG_CL_MRFC522 +#ifdef CONFIG_CL_MFRC522 (void)stm32_configgpio(GPIO_CS_MFRC522); /* MFRC522 chip select */ #endif @@ -112,7 +112,7 @@ void stm32_spidev_initialize(void) void stm32_spi1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected) { -#if defined(CONFIG_CL_MRFC522) +#if defined(CONFIG_CL_MFRC522) if (devid == SPIDEV_WIRELESS) { stm32_gpiowrite(GPIO_CS_MFRC522, !selected); diff --git a/configs/stm32f103-minimum/src/stm32f103_minimum.h b/configs/stm32f103-minimum/src/stm32f103_minimum.h index 68c57ba3a19..a52b49b3a0b 100644 --- a/configs/stm32f103-minimum/src/stm32f103_minimum.h +++ b/configs/stm32f103-minimum/src/stm32f103_minimum.h @@ -139,7 +139,7 @@ void stm32_usbinitialize(void); * ************************************************************************************/ -#ifdef CONFIG_CL_MRFC522 +#ifdef CONFIG_CL_MFRC522 int stm32_mfrc522initialize(FAR const char *devpath); #endif