apache
diff --git a/‎hw/bsp/nordic_pca10056/src/hal_bsp.c
+1-1 b/‎hw/bsp/nordic_pca10056/src/hal_bsp.c
+1-1
diff --git a/‎hw/bsp/nordic_pca10059/src/hal_bsp.c
+1-1 b/‎hw/bsp/nordic_pca10059/src/hal_bsp.c
+1-1
diff --git a/‎hw/bsp/nordic_pca10095/src/hal_bsp.c
+1-1 b/‎hw/bsp/nordic_pca10095/src/hal_bsp.c
+1-1
diff --git a/‎hw/bsp/nordic_pca10121/src/hal_bsp.c
+1-1 b/‎hw/bsp/nordic_pca10121/src/hal_bsp.c
+1-1
diff --git a/‎hw/bsp/nordic_thingy53/src/hal_bsp.c
+1-1 b/‎hw/bsp/nordic_thingy53/src/hal_bsp.c
+1-1
diff --git a/‎hw/bsp/ublox_bmd_345/src/hal_bsp.c
+1-1 b/‎hw/bsp/ublox_bmd_345/src/hal_bsp.c
+1-1
diff --git a/‎hw/mcu/nordic/nrf52xxx/include/mcu/nrf52_hal.h
-2 b/‎hw/mcu/nordic/nrf52xxx/include/mcu/nrf52_hal.h
-2
diff --git a/‎hw/mcu/nordic/nrf52xxx/include/nrfx_config_nrf52840.h
+4 b/‎hw/mcu/nordic/nrf52xxx/include/nrfx_config_nrf52840.h
+4
@@ -52,7 +52,7 @@ hal_bsp_flash_dev(uint8_t id)
     }
 #if MYNEWT_VAL(QSPI_ENABLE)
     if (id == 1) {
-        return &nrf52k_qspi_dev;
+        return &nrf_qspi_dev;
     }
 #endif
     return NULL;
 
@@ -52,7 +52,7 @@ hal_bsp_flash_dev(uint8_t id)
     }
 #if MYNEWT_VAL(QSPI_ENABLE)
     if (id == 1) {
-        return &nrf52k_qspi_dev;
+        return &nrf_qspi_dev;
     }
 #endif
     return NULL;
 
@@ -58,7 +58,7 @@ hal_bsp_flash_dev(uint8_t id)
     }
 #if MYNEWT_VAL(QSPI_ENABLE)
     if (id == 1) {
-        return &nrf5340_qspi_dev;
+        return &nrf_qspi_dev;
     }
 #endif
 #if MYNEWT_VAL(IPC_NRF5340_FLASH_CLIENT)
 
@@ -59,7 +59,7 @@ hal_bsp_flash_dev(uint8_t id)
     }
 #if MYNEWT_VAL(QSPI_ENABLE)
     if (id == 1) {
-        return &nrf5340_qspi_dev;
+        return &nrf_qspi_dev;
     }
 #endif
 #if MYNEWT_VAL(IPC_NRF5340_FLASH_CLIENT)
 
@@ -58,7 +58,7 @@ hal_bsp_flash_dev(uint8_t id)
     }
 #if MYNEWT_VAL(QSPI_ENABLE)
     if (id == 1) {
-        return &nrf5340_qspi_dev;
+        return &nrf_qspi_dev;
     }
 #endif
 #if MYNEWT_VAL(IPC_NRF5340_FLASH_CLIENT)
 
@@ -53,7 +53,7 @@ hal_bsp_flash_dev(uint8_t id)
     }
 #if MYNEWT_VAL(QSPI_ENABLE)
     if (id == 1) {
-        return &nrf52k_qspi_dev;
+        return &nrf_qspi_dev;
     }
 #endif
     return NULL;
 
@@ -40,8 +40,6 @@ struct nrf52_hal_i2c_cfg {
     uint32_t i2c_frequency;
 };
 
-extern const struct hal_flash nrf52k_qspi_dev;
-
 /* SPI configuration (used for both master and slave) */
 struct nrf52_hal_spi_cfg {
     uint8_t sck_pin;
 
@@ -782,8 +782,12 @@
  * Boolean. Accepted values: 0 and 1.
  */
 #ifndef NRFX_QSPI_ENABLED
+#if MYNEWT_VAL(QSPI_ENABLE)
+#define NRFX_QSPI_ENABLED 1
+#else
 #define NRFX_QSPI_ENABLED 0
 #endif
+#endif
 
 /**
  * @brief NRFX_QSPI_DEFAULT_CONFIG_IRQ_PRIORITY
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ hal_bsp_flash_dev(uint8_t id)`
`52`	`52`	`}`
`53`	`53`	`#if MYNEWT_VAL(QSPI_ENABLE)`
`54`	`54`	`if (id == 1) {`
`55`		`- return &nrf52k_qspi_dev;`
	`55`	`+ return &nrf_qspi_dev;`
`56`	`56`	`}`
`57`	`57`	`#endif`
`58`	`58`	`return NULL;`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ hal_bsp_flash_dev(uint8_t id)`
`58`	`58`	`}`
`59`	`59`	`#if MYNEWT_VAL(QSPI_ENABLE)`
`60`	`60`	`if (id == 1) {`
`61`		`- return &nrf5340_qspi_dev;`
	`61`	`+ return &nrf_qspi_dev;`
`62`	`62`	`}`
`63`	`63`	`#endif`
`64`	`64`	`#if MYNEWT_VAL(IPC_NRF5340_FLASH_CLIENT)`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ hal_bsp_flash_dev(uint8_t id)`
`59`	`59`	`}`
`60`	`60`	`#if MYNEWT_VAL(QSPI_ENABLE)`
`61`	`61`	`if (id == 1) {`
`62`		`- return &nrf5340_qspi_dev;`
	`62`	`+ return &nrf_qspi_dev;`
`63`	`63`	`}`
`64`	`64`	`#endif`
`65`	`65`	`#if MYNEWT_VAL(IPC_NRF5340_FLASH_CLIENT)`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ hal_bsp_flash_dev(uint8_t id)`
`53`	`53`	`}`
`54`	`54`	`#if MYNEWT_VAL(QSPI_ENABLE)`
`55`	`55`	`if (id == 1) {`
`56`		`- return &nrf52k_qspi_dev;`
	`56`	`+ return &nrf_qspi_dev;`
`57`	`57`	`}`
`58`	`58`	`#endif`
`59`	`59`	`return NULL;`