diff --git a/projects/Generic/linux/linux.x86_64.conf b/projects/Generic/linux/linux.x86_64.conf
index 70d841777c..97c5b53c7a 100644
--- a/projects/Generic/linux/linux.x86_64.conf
+++ b/projects/Generic/linux/linux.x86_64.conf
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 4.12.0-rc1 Kernel Configuration
+# Linux/x86_64 4.12.0-rc2 Kernel Configuration
 #
 CONFIG_64BIT=y
 CONFIG_X86_64=y
@@ -4412,6 +4412,7 @@ CONFIG_STAGING_MEDIA=y
 CONFIG_DVB_CXD2099=m
 CONFIG_LIRC_STAGING=y
 # CONFIG_LIRC_ZILOG is not set
+CONFIG_LIRC_XBOX=m
 
 #
 # Android
@@ -4602,7 +4603,6 @@ CONFIG_THUNDERBOLT=m
 # FSI support
 #
 # CONFIG_FSI is not set
-# CONFIG_TEE is not set
 
 #
 # Firmware Drivers
diff --git a/projects/RPi/devices/RPi/linux/linux.arm.conf b/projects/RPi/devices/RPi/linux/linux.arm.conf
index 0c9622a953..b1ecb46866 100644
--- a/projects/RPi/devices/RPi/linux/linux.arm.conf
+++ b/projects/RPi/devices/RPi/linux/linux.arm.conf
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 4.12.0-rc1 Kernel Configuration
+# Linux/arm 4.12.0-rc2 Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_ARM_HAS_SG_CHAIN=y
@@ -3701,6 +3701,7 @@ CONFIG_STAGING_MEDIA=y
 CONFIG_LIRC_STAGING=y
 CONFIG_LIRC_RPI=m
 # CONFIG_LIRC_ZILOG is not set
+CONFIG_LIRC_XBOX=m
 
 #
 # Android
@@ -3865,7 +3866,6 @@ CONFIG_RESET_CONTROLLER=y
 # FSI support
 #
 # CONFIG_FSI is not set
-# CONFIG_TEE is not set
 
 #
 # Firmware Drivers
diff --git a/projects/RPi/devices/RPi2/linux/linux.arm.conf b/projects/RPi/devices/RPi2/linux/linux.arm.conf
index a384c7dae0..a45dc3cf3f 100644
--- a/projects/RPi/devices/RPi2/linux/linux.arm.conf
+++ b/projects/RPi/devices/RPi2/linux/linux.arm.conf
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 4.12.0-rc1 Kernel Configuration
+# Linux/arm 4.12.0-rc2 Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_ARM_HAS_SG_CHAIN=y
@@ -3794,6 +3794,7 @@ CONFIG_STAGING_MEDIA=y
 CONFIG_LIRC_STAGING=y
 CONFIG_LIRC_RPI=m
 # CONFIG_LIRC_ZILOG is not set
+CONFIG_LIRC_XBOX=m
 
 #
 # Android