diff --git a/projects/RPi/linux/linux.arm.conf b/projects/RPi/linux/linux.arm.conf
index 440b156e4..4a1d75bbf 100644
--- a/projects/RPi/linux/linux.arm.conf
+++ b/projects/RPi/linux/linux.arm.conf
@@ -1381,6 +1381,7 @@ CONFIG_HW_RANDOM_BCM2708=m
 CONFIG_BRCM_CHAR_DRIVERS=y
 CONFIG_BCM_VC_CMA=y
 CONFIG_BCM2708_VCMEM=y
+CONFIG_BCM_VCIO=y
 CONFIG_BCM_VC_SM=y
 # CONFIG_XILLYBUS is not set
 
@@ -3018,6 +3019,7 @@ CONFIG_BCM2708_MBOX=y
 # CONFIG_ARM_MHU is not set
 # CONFIG_PL320_MBOX is not set
 # CONFIG_ALTERA_MBOX is not set
+CONFIG_BCM2835_MBOX=y
 # CONFIG_IOMMU_SUPPORT is not set
 
 #
@@ -3032,7 +3034,6 @@ CONFIG_BCM2708_MBOX=y
 #
 # SOC (System On Chip) specific Drivers
 #
-CONFIG_BCM2708_POWER=y
 # CONFIG_SOC_TI is not set
 # CONFIG_PM_DEVFREQ is not set
 CONFIG_EXTCON=m
@@ -3070,6 +3071,7 @@ CONFIG_IRQCHIP=y
 # Firmware Drivers
 #
 # CONFIG_FIRMWARE_MEMMAP is not set
+CONFIG_RASPBERRYPI_FIRMWARE=y
 
 #
 # File systems
diff --git a/projects/RPi2/linux/linux.arm.conf b/projects/RPi2/linux/linux.arm.conf
index da7c521ff..a2ad6b9d5 100644
--- a/projects/RPi2/linux/linux.arm.conf
+++ b/projects/RPi2/linux/linux.arm.conf
@@ -1433,6 +1433,7 @@ CONFIG_HW_RANDOM_BCM2708=m
 CONFIG_BRCM_CHAR_DRIVERS=y
 CONFIG_BCM_VC_CMA=y
 CONFIG_BCM2708_VCMEM=y
+CONFIG_BCM_VCIO=y
 CONFIG_BCM_VC_SM=y
 # CONFIG_XILLYBUS is not set
 
@@ -3073,6 +3074,7 @@ CONFIG_BCM2708_MBOX=y
 # CONFIG_ARM_MHU is not set
 # CONFIG_PL320_MBOX is not set
 # CONFIG_ALTERA_MBOX is not set
+CONFIG_BCM2835_MBOX=y
 # CONFIG_IOMMU_SUPPORT is not set
 
 #
@@ -3087,7 +3089,6 @@ CONFIG_BCM2708_MBOX=y
 #
 # SOC (System On Chip) specific Drivers
 #
-CONFIG_BCM2708_POWER=y
 # CONFIG_SOC_TI is not set
 # CONFIG_PM_DEVFREQ is not set
 CONFIG_EXTCON=m
@@ -3125,6 +3126,7 @@ CONFIG_IRQCHIP=y
 # Firmware Drivers
 #
 # CONFIG_FIRMWARE_MEMMAP is not set
+CONFIG_RASPBERRYPI_FIRMWARE=y
 
 #
 # File systems