diff --git a/src/drivers/boards/aerocore2/aerocore2_init.c b/src/drivers/boards/aerocore2/aerocore2_init.c
index 52acbcd83a..83a309a7d7 100644
--- a/src/drivers/boards/aerocore2/aerocore2_init.c
+++ b/src/drivers/boards/aerocore2/aerocore2_init.c
@@ -287,7 +287,7 @@ __EXPORT int board_app_initialize(uintptr_t arg)
 	SPI_SETFREQUENCY(spi4, 12 * 1000 * 1000);
 	SPI_SETBITS(spi4, 8);
 	SPI_SETMODE(spi4, SPIDEV_MODE3);
-	SPI_SELECT(spi4, SPIDEV_FLASH, false);
+	SPI_SELECT(spi4, SPIDEV_FLASH(0), false);
 
 	return OK;
 }
diff --git a/src/drivers/boards/aerocore2/aerocore2_spi.c b/src/drivers/boards/aerocore2/aerocore2_spi.c
index 74db593fb1..4695a712ec 100644
--- a/src/drivers/boards/aerocore2/aerocore2_spi.c
+++ b/src/drivers/boards/aerocore2/aerocore2_spi.c
@@ -96,33 +96,33 @@ __EXPORT void stm32_spiinitialize(void)
 }
 
 #ifdef CONFIG_STM32_SPI1
-__EXPORT void stm32_spi1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
+__EXPORT void stm32_spi1select(FAR struct spi_dev_s *dev, uint32_t devid, bool selected)
 {
 	/* there is only one device broken-out so select it */
 	px4_arch_gpiowrite(GPIO_SPI1_NSS, !selected);
 }
 
-__EXPORT uint8_t stm32_spi1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
+__EXPORT uint8_t stm32_spi1status(FAR struct spi_dev_s *dev, uint32_t devid)
 {
 	return SPI_STATUS_PRESENT;
 }
 #endif
 
 #ifdef CONFIG_STM32_SPI2
-__EXPORT void stm32_spi2select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
+__EXPORT void stm32_spi2select(FAR struct spi_dev_s *dev, uint32_t devid, bool selected)
 {
 	/* there is only one device broken-out so select it */
 	px4_arch_gpiowrite(GPIO_SPI2_NSS, !selected);
 }
 
-__EXPORT uint8_t stm32_spi2status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
+__EXPORT uint8_t stm32_spi2status(FAR struct spi_dev_s *dev, uint32_t devid)
 {
 	return SPI_STATUS_PRESENT;
 }
 #endif
 
 #ifdef CONFIG_STM32_SPI3
-__EXPORT void stm32_spi3select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
+__EXPORT void stm32_spi3select(FAR struct spi_dev_s *dev, uint32_t devid, bool selected)
 {
 	/* SPI select is active low, so write !selected to select the device */
 
@@ -154,20 +154,20 @@ __EXPORT void stm32_spi3select(FAR struct spi_dev_s *dev, enum spi_dev_e devid,
 }
 #endif
 
-__EXPORT uint8_t stm32_spi3status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
+__EXPORT uint8_t stm32_spi3status(FAR struct spi_dev_s *dev, uint32_t devid)
 {
 	return SPI_STATUS_PRESENT;
 }
 
 
 #ifdef CONFIG_STM32_SPI4
-__EXPORT void stm32_spi4select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
+__EXPORT void stm32_spi4select(FAR struct spi_dev_s *dev, uint32_t devid, bool selected)
 {
 	/* there can only be one device on this bus, so always select it */
 	px4_arch_gpiowrite(GPIO_SPI_CS_FRAM, !selected);
 }
 
-__EXPORT uint8_t stm32_spi4status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
+__EXPORT uint8_t stm32_spi4status(FAR struct spi_dev_s *dev, uint32_t devid)
 {
 	/* FRAM is always present */
 	return SPI_STATUS_PRESENT;
diff --git a/src/drivers/boards/aerocore2/board_config.h b/src/drivers/boards/aerocore2/board_config.h
index 54f86aae4d..011fa2ade6 100644
--- a/src/drivers/boards/aerocore2/board_config.h
+++ b/src/drivers/boards/aerocore2/board_config.h
@@ -100,10 +100,10 @@
 #define PX4_SPI_BUS_EXT		1
 #define PX4_SPI_BUS_BARO	PX4_SPI_BUS_SENSORS
 
-/* Use these in place of the spi_dev_e enumeration to select a specific SPI device on SPI3 */
-#define PX4_SPIDEV_GYRO		1
-#define PX4_SPIDEV_ACCEL_MAG	2
-#define PX4_SPIDEV_BARO		3
+/* Use these in place of the uint32_t enumeration to select a specific SPI device on SPI3 */
+#define PX4_SPIDEV_GYRO       PX4_MK_SPI_SEL(PX4_SPI_BUS_SENSORS, 1)
+#define PX4_SPIDEV_ACCEL_MAG  PX4_MK_SPI_SEL(PX4_SPI_BUS_SENSORS, 2)
+#define PX4_SPIDEV_BARO       PX4_MK_SPI_SEL(PX4_SPI_BUS_SENSORS, 3)
 
 /* I2C busses */
 #define PX4_I2C_BUS_EXPANSION	1