diff --git a/media_driver/agnostic/media_srcs.cmake b/media_driver/agnostic/media_srcs.cmake
index 1ead9ccc1a8..c9de43c4033 100755
--- a/media_driver/agnostic/media_srcs.cmake
+++ b/media_driver/agnostic/media_srcs.cmake
@@ -336,11 +336,11 @@ endif()
 
 media_include_subdirectory(common)
 
-if(ENABLE_REQUIRED_GEN_CODE OR GEN8)
+if(GEN8)
     media_include_subdirectory(gen8)
 endif()
 
-if(ENABLE_REQUIRED_GEN_CODE OR GEN8_BDW)
+if(GEN8_BDW)
     media_include_subdirectory(gen8_bdw)
 endif()
 
diff --git a/media_driver/cmake/linux/media_gen_flags_linux.cmake b/media_driver/cmake/linux/media_gen_flags_linux.cmake
index 3ef82683ac1..80e6e12fd66 100644
--- a/media_driver/cmake/linux/media_gen_flags_linux.cmake
+++ b/media_driver/cmake/linux/media_gen_flags_linux.cmake
@@ -21,7 +21,7 @@
 # TODO: Remove this option when all Gen options can successfully disable
 #       driver code.
 # Status:
-#   GEN8:  TODO
+#   GEN8:  Done
 #   GEN9:  TODO
 #   GEN10: TODO (Remove)
 #   GEN11: TODO
diff --git a/media_driver/linux/media_srcs.cmake b/media_driver/linux/media_srcs.cmake
index 62939e87114..613ecea92a5 100644
--- a/media_driver/linux/media_srcs.cmake
+++ b/media_driver/linux/media_srcs.cmake
@@ -20,7 +20,7 @@
 
 media_include_subdirectory(common)
 
-if(ENABLE_REQUIRED_GEN_CODE OR GEN8)
+if(GEN8)
     media_include_subdirectory(gen8)
 endif()
 
diff --git a/media_driver/media_interface/media_srcs.cmake b/media_driver/media_interface/media_srcs.cmake
index d7ffeaa4df8..e0dc45e09c5 100644
--- a/media_driver/media_interface/media_srcs.cmake
+++ b/media_driver/media_interface/media_srcs.cmake
@@ -19,7 +19,7 @@
 # OTHER DEALINGS IN THE SOFTWARE.
 
 
-if(ENABLE_REQUIRED_GEN_CODE OR GEN8_BDW)
+if(GEN8_BDW)
     media_include_subdirectory(media_interfaces_m8_bdw)
 endif()