Fix defines

Author: mjwinney

targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/objects.h

@@ -43,9 +43,9 @@
 #include "PortNames.h"
 #include "PeripheralNames.h"
 #include "PinNames.h"
-#if NRFX_SPIM_ENABLED || defined(DEVICE_SPIM)
+#if NRFX_SPIM_ENABLED && DEVICE_SPI
 #include "nrfx_spim.h"
-#elif NRFX_SPI_ENABLED || defined(DEVICE_SPI)
+#elif DEVICE_SPI
 #include "nrfx_spi.h"
 #endif
 #include "nrf_twi.h"
@@ -94,9 +94,9 @@ struct serial_s {
 struct spi_s {
     int instance;
     PinName cs;
-#if NRFX_SPIM_ENABLED || defined(DEVICE_SPIM)
+#if NRFX_SPIM_ENABLED && DEVICE_SPI
     nrfx_spim_config_t config;
-#elif NRFX_SPI_ENABLED || defined(DEVICE_SPI)
+#elif DEVICE_SPI
     nrfx_spi_config_t config;
 #endif
     bool update;