Add more DEVICE_SPI guards to other files

Author: Donatien Garnier

targets/TARGET_ARM_SSG/TARGET_BEETLE/analogin_api.c

@@ -22,7 +22,7 @@
 #include "spi_api.h"
 #include "pinmap.h"
 
-#if DEVICE_ANALOGIN
+#if DEVICE_ANALOGIN && DEVICE_SPI
 
 /*
  * Channel Address for the next acquisition:

targets/TARGET_ARM_SSG/TARGET_CM3DS_MPS2/analogin_api.c

@@ -19,6 +19,8 @@
  * available on the MPS2 Adapter for Arduino shields.
  */
 
+#if DEVICE_ANALOGIN && DEVICE_SPI
+
 #include "analogin_api.h"
 #include "gpio_api.h"
 #include "spi_api.h"
@@ -151,3 +153,5 @@ float analogin_read(analogin_t *obj)
 
     return (result * (1. / MAXIMUM_VALUE_12_BITS));
 }
+
+#endif

targets/TARGET_Silicon_Labs/TARGET_EFM32/TARGET_EFM32GG/PeripheralPins.c

@@ -117,6 +117,7 @@ MBED_WEAK const PinMap PinMap_PWM[] = {
 };
 
 /*************SPI**************/
+#if SPI_DEVICE
 MBED_WEAK const PinMap PinMap_SPI_MOSI[] = {
 #ifdef USART0_BASE
     /* USART0 */
@@ -204,6 +205,7 @@ MBED_WEAK const PinMap PinMap_SPI_CS[] = {
     /* Not connected */
     {NC  , NC   , NC}
 };
+#endif
 
 /************UART**************/
 MBED_WEAK const PinMap PinMap_UART_TX[] = {

targets/TARGET_Silicon_Labs/TARGET_EFM32/TARGET_EFM32LG/PeripheralPins.c

@@ -117,6 +117,7 @@ MBED_WEAK const PinMap PinMap_PWM[] = {
 };
 
 /*************SPI**************/
+#if DEVICE_SPI
 MBED_WEAK const PinMap PinMap_SPI_MOSI[] = {
 #ifdef USART0_BASE
     /* USART0 */
@@ -204,6 +205,7 @@ MBED_WEAK const PinMap PinMap_SPI_CS[] = {
     /* Not connected */
     {NC  , NC   , NC}
 };
+#endif
 
 /************UART**************/
 MBED_WEAK const PinMap PinMap_UART_TX[] = {

targets/TARGET_Silicon_Labs/TARGET_EFM32/TARGET_EFM32PG/PeripheralPins.c

@@ -198,6 +198,7 @@ MBED_WEAK const PinMap PinMap_PWM[] = {
 };
 
 /*************SPI**************/
+#if SPI_DEVICE
 MBED_WEAK const PinMap PinMap_SPI_MOSI[] = {
 #ifdef USART0_BASE
     /* USART0 */
@@ -368,6 +369,7 @@ MBED_WEAK const PinMap PinMap_SPI_CS[] = {
 #endif
     {NC  , NC   , NC}
 };
+#endif
 
 /************UART**************/
 MBED_WEAK const PinMap PinMap_UART_TX[] = {

targets/TARGET_Silicon_Labs/TARGET_EFM32/TARGET_EFM32PG12/PeripheralPins.c

@@ -262,6 +262,7 @@ MBED_WEAK const PinMap PinMap_PWM[] = {
 };
 
 /*************SPI**************/
+#if DEVICE_SPI
 MBED_WEAK const PinMap PinMap_SPI_MOSI[] = {
 #ifdef USART0_BASE
     /* USART0 */
@@ -584,6 +585,7 @@ MBED_WEAK const PinMap PinMap_SPI_CS[] = {
 #endif
     {NC  , NC   , NC}
 };
+#endif
 
 /************UART**************/
 MBED_WEAK const PinMap PinMap_UART_TX[] = {

targets/TARGET_Silicon_Labs/TARGET_EFM32/TARGET_EFM32WG/PeripheralPins.c

@@ -117,6 +117,7 @@ MBED_WEAK const PinMap PinMap_PWM[] = {
 };
 
 /*************SPI**************/
+#if DEVICE_SPI
 MBED_WEAK const PinMap PinMap_SPI_MOSI[] = {
 #ifdef USART0_BASE
     /* USART0 */
@@ -204,6 +205,7 @@ MBED_WEAK const PinMap PinMap_SPI_CS[] = {
     /* Not connected */
     {NC  , NC   , NC}
 };
+#endif
 
 /************UART**************/
 MBED_WEAK const PinMap PinMap_UART_TX[] = {

targets/TARGET_Silicon_Labs/TARGET_EFM32/TARGET_EFR32MG1/PeripheralPins.c

@@ -198,6 +198,7 @@ MBED_WEAK const PinMap PinMap_PWM[] = {
 };
 
 /*************SPI**************/
+#if DEVICE_SPI
 MBED_WEAK const PinMap PinMap_SPI_MOSI[] = {
 #ifdef USART0_BASE
     /* USART0 */
@@ -368,6 +369,7 @@ MBED_WEAK const PinMap PinMap_SPI_CS[] = {
 #endif
     {NC  , NC   , NC}
 };
+#endif
 
 /************UART**************/
 MBED_WEAK const PinMap PinMap_UART_TX[] = {

targets/TARGET_Silicon_Labs/TARGET_EFM32/TARGET_EFR32MG12/PeripheralPins.c

@@ -265,6 +265,7 @@ MBED_WEAK const PinMap PinMap_PWM[] = {
 };
 
 /*************SPI**************/
+#if DEVICE_SPI
 MBED_WEAK const PinMap PinMap_SPI_MOSI[] = {
 #ifdef USART0_BASE
     /* USART0 */
@@ -587,6 +588,7 @@ MBED_WEAK const PinMap PinMap_SPI_CS[] = {
 #endif
     {NC  , NC   , NC}
 };
+#endif
 
 /************UART**************/
 MBED_WEAK const PinMap PinMap_UART_TX[] = {

targets/targets.json

@@ -1408,7 +1408,6 @@
         "inherits": ["K64F"],
         "extra_labels_add": ["K64F"],
         "extra_labels_remove": ["FRDM"],
-        "components_remove": ["SD"],
         "supported_form_factors": [],
         "detect_code": ["3105"]
     },
@@ -1712,7 +1711,6 @@
     "UBRIDGE": {
         "inherits": ["K82F"],
         "extra_labels_remove": ["FRDM"],
-        "components_remove": ["SPIF"],
         "device_has_remove": ["QSPI"],
         "supported_form_factors": []
     },