diff --git a/common/hw-gfx-gma-config.ads.template b/common/hw-gfx-gma-config.ads.template
index fc14a46..2667333 100644
--- a/common/hw-gfx-gma-config.ads.template
+++ b/common/hw-gfx-gma-config.ads.template
@@ -396,6 +396,14 @@
       (Device_Id and 16#ffcf#) = 16#590b# or
       (Device_Id and 16#ffcf#) = 16#590d#);
 
+   function Is_Coffee_Lake_Y_AML (Device_Id : Word16) return Boolean is
+     (Device_Id = 16#87ca#);
+   -- Including Whiskey Lake:
+   function Is_Coffee_Lake_U (Device_Id : Word16) return Boolean is
+     ((Device_Id and 16#fff0#) = 16#3ea0#);
+   function Is_Coffee_Lake (Device_Id : Word16) return Boolean is
+     ((Device_Id and 16#fff0#) = 16#3e90#);
+
    function Is_GPU (Device_Id : Word16; CPU : CPU_Type; CPU_Var : CPU_Variant)
       return Boolean is
      (case CPU is
@@ -418,10 +426,16 @@
                                  when ULT    => Is_Skylake_U (Device_Id),
                                  when ULX    => Is_Skylake_Y (Device_Id)),
          when Kabylake     => (case CPU_Var is
-                                 when Normal => Is_Kaby_Lake (Device_Id),
-                                 when ULT    => Is_Kaby_Lake_U (Device_Id),
-                                 when ULX    => Is_Kaby_Lake_Y (Device_Id) or
-                                                Is_Kaby_Lake_Y_AML (Device_Id)));
+                                 when Normal =>
+                                    Is_Kaby_Lake (Device_Id) or
+                                    Is_Coffee_Lake (Device_Id),
+                                 when ULT    =>
+                                    Is_Kaby_Lake_U (Device_Id) or
+                                    Is_Coffee_Lake_U (Device_Id),
+                                 when ULX    =>
+                                    Is_Kaby_Lake_Y (Device_Id) or
+                                    Is_Kaby_Lake_Y_AML (Device_Id) or
+                                    Is_Coffee_Lake_Y_AML (Device_Id)));
 
    function Compatible_GPU (Device_Id : Word16) return Boolean is
      (Is_GPU (Device_Id, CPU, CPU_Var));