arm/stm32f103-minimum: Use common board MFRC522

acassis · Aug 10, 2024 · 53d4aae · 53d4aae
1 parent 7e0db94
commit 53d4aae
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 106 deletions.
diff --git a/boards/arm/stm32/stm32f103-minimum/configs/rfid-rc522/defconfig b/boards/arm/stm32/stm32f103-minimum/configs/rfid-rc522/defconfig
@@ -19,6 +19,7 @@
 # CONFIG_NSH_DISABLE_XD is not set
 CONFIG_ARCH="arm"
 CONFIG_ARCH_BOARD="stm32f103-minimum"
+CONFIG_ARCH_BOARD_COMMON=y
 CONFIG_ARCH_BOARD_STM32F103_MINIMUM=y
 CONFIG_ARCH_CHIP="stm32"
 CONFIG_ARCH_CHIP_STM32=y

diff --git a/boards/arm/stm32/stm32f103-minimum/src/CMakeLists.txt b/boards/arm/stm32/stm32f103-minimum/src/CMakeLists.txt
@@ -79,10 +79,6 @@ if(CONFIG_CAN_MCP2515)
   list(APPEND SRCS stm32_mcp2515.c)
 endif()
 
-if(CONFIG_CL_MFRC522)
-  list(APPEND SRCS stm32_mfrc522.c)
-endif()
-
 if(CONFIG_LCD_MAX7219)
   list(APPEND SRCS stm32_max7219.c)
 endif()

diff --git a/boards/arm/stm32/stm32f103-minimum/src/Make.defs b/boards/arm/stm32/stm32f103-minimum/src/Make.defs
@@ -81,10 +81,6 @@ ifeq ($(CONFIG_CAN_MCP2515),y)
   CSRCS += stm32_mcp2515.c
 endif
 
-ifeq ($(CONFIG_CL_MFRC522),y)
-  CSRCS += stm32_mfrc522.c
-endif
-
 ifeq ($(CONFIG_LCD_MAX7219),y)
   CSRCS += stm32_max7219.c
 endif

diff --git a/boards/arm/stm32/stm32f103-minimum/src/stm32_bringup.c b/boards/arm/stm32/stm32f103-minimum/src/stm32_bringup.c
@@ -56,6 +56,10 @@
 #  include <nuttx/video/fb.h>
 #endif
 
+#ifdef CONFIG_CL_MFRC522
+#include "stm32_mfrc522.h"
+#endif
+
 #include "stm32f103_minimum.h"
 
 /* Conditional logic in stm32f103_minimum.h will determine if certain

diff --git a/boards/arm/stm32/stm32f103-minimum/src/stm32_mfrc522.c b/boards/arm/stm32/stm32f103-minimum/src/stm32_mfrc522.c
diff --git a/boards/arm/stm32/stm32f103-minimum/src/stm32f103_minimum.h b/boards/arm/stm32/stm32f103-minimum/src/stm32f103_minimum.h
@@ -372,17 +372,5 @@ int stm32_hyt271initialize(int devno);
 int stm32_ds18b20initialize(int devno);
 #endif
 
-/****************************************************************************
- * Name: stm32_mfrc522initialize
- *
- * Description:
- *   Function used to initialize the MFRC522 RFID Transceiver
- *
- ****************************************************************************/
-
-#ifdef CONFIG_CL_MFRC522
-int stm32_mfrc522initialize(const char *devpath);
-#endif
-
 #endif /* __ASSEMBLY__ */
 #endif /* __BOARDS_ARM_STM32_STM32F103_MINIMUM_SRC_STM32F103_MINIMUM_H */