diff --git a/projects/RPi/devices/RPi/linux/linux.arm.conf b/projects/RPi/devices/RPi/linux/linux.arm.conf
index d117599b42..3981ad307d 100644
--- a/projects/RPi/devices/RPi/linux/linux.arm.conf
+++ b/projects/RPi/devices/RPi/linux/linux.arm.conf
@@ -3238,6 +3238,7 @@ CONFIG_MEDIA_PLATFORM_DRIVERS=y
 #
 # Raspberry Pi media platform drivers
 #
+# CONFIG_VIDEO_RPI_HEVC_DEC is not set
 # CONFIG_VIDEO_RP1_CFE is not set
 
 #
@@ -5115,7 +5116,6 @@ CONFIG_R8712U=m
 CONFIG_VT6656=m
 CONFIG_STAGING_MEDIA=y
 # CONFIG_VIDEO_MAX96712 is not set
-# CONFIG_VIDEO_RPIVID is not set
 
 #
 # StarFive media platform drivers
diff --git a/projects/RPi/devices/RPi2/linux/linux.arm.conf b/projects/RPi/devices/RPi2/linux/linux.arm.conf
index 1c78a76e44..e0c3eea740 100644
--- a/projects/RPi/devices/RPi2/linux/linux.arm.conf
+++ b/projects/RPi/devices/RPi2/linux/linux.arm.conf
@@ -3477,6 +3477,7 @@ CONFIG_MEDIA_PLATFORM_DRIVERS=y
 #
 # Raspberry Pi media platform drivers
 #
+# CONFIG_VIDEO_RPI_HEVC_DEC is not set
 # CONFIG_VIDEO_RP1_CFE is not set
 
 #
@@ -5356,7 +5357,6 @@ CONFIG_R8712U=m
 CONFIG_VT6656=m
 CONFIG_STAGING_MEDIA=y
 # CONFIG_VIDEO_MAX96712 is not set
-# CONFIG_VIDEO_RPIVID is not set
 
 #
 # StarFive media platform drivers
diff --git a/projects/RPi/devices/RPi4/linux/linux.aarch64.conf b/projects/RPi/devices/RPi4/linux/linux.aarch64.conf
index 8673e8d91a..e2cb7671b4 100644
--- a/projects/RPi/devices/RPi4/linux/linux.aarch64.conf
+++ b/projects/RPi/devices/RPi4/linux/linux.aarch64.conf
@@ -4135,6 +4135,7 @@ CONFIG_MEDIA_PLATFORM_DRIVERS=y
 #
 # Raspberry Pi media platform drivers
 #
+CONFIG_VIDEO_RPI_HEVC_DEC=m
 # CONFIG_VIDEO_RP1_CFE is not set
 
 #
@@ -6130,7 +6131,6 @@ CONFIG_VT6656=m
 CONFIG_STAGING_MEDIA=y
 # CONFIG_DVB_AV7110 is not set
 # CONFIG_VIDEO_MAX96712 is not set
-CONFIG_VIDEO_RPIVID=m
 
 #
 # StarFive media platform drivers
diff --git a/projects/RPi/devices/RPi5/linux/linux.aarch64.conf b/projects/RPi/devices/RPi5/linux/linux.aarch64.conf
index e5d3a85679..4fd3a8b4d4 100644
--- a/projects/RPi/devices/RPi5/linux/linux.aarch64.conf
+++ b/projects/RPi/devices/RPi5/linux/linux.aarch64.conf
@@ -4161,6 +4161,7 @@ CONFIG_MEDIA_PLATFORM_DRIVERS=y
 #
 # Raspberry Pi media platform drivers
 #
+CONFIG_VIDEO_RPI_HEVC_DEC=m
 CONFIG_VIDEO_RP1_CFE=m
 
 #
@@ -6180,7 +6181,6 @@ CONFIG_VT6656=m
 CONFIG_STAGING_MEDIA=y
 # CONFIG_DVB_AV7110 is not set
 # CONFIG_VIDEO_MAX96712 is not set
-CONFIG_VIDEO_RPIVID=m
 
 #
 # StarFive media platform drivers