Merge branch 'master' of https://github.com/CloverHackyColor/CloverBootloader

Author: SergeySlice

rEFIt_UEFI/Platform/platformdata.cpp

@@ -256,25 +256,33 @@ PLATFORMDATA ApplePlatformData[] =
     "MacBook Pro", "1.0", "C02TQHACHTD5", "MacBook-Aluminum",
     { 0x02, 0x45, 0x0f, 0, 0, 0x01 },  "2017mbp", "j80ga", 0xf0a009 },
   //MacBookPro15,1 / MacBook Pro (15-inch, 2018)
-  { "MacBookPro15,1", "MBP151.88Z.F000.B00.2003170204", "1037.100.359.0.0", "Mac-937A206F2EE63C01", // Intel Core i9-8950HK @ 2.90 GHz
+  { "MacBookPro15,1", "MBP151.88Z.F000.B00.2004232129", "1037.120.79.0.0", "Mac-937A206F2EE63C01", // Intel Core i9-8950HK @ 2.90 GHz
     "MacBook Pro", "1.0", "C02X1HACKGYG", "MacBook-Aluminum",
     { 0, 0, 0, 0, 0, 0 }, NULL, "j680", 0 },
   //MacBookPro15,2 / MacBook Pro (13-inch, 2018, Four Thunderbolt 3 Ports)
-  { "MacBookPro15,2", "MBP152.88Z.F000.B00.2003170152", "1037.100.359.0.0", "Mac-827FB448E656EC26", // Intel Core i5-8259U @ 2.30 GHz
+  { "MacBookPro15,2", "MBP152.88Z.F000.B00.2004232118", "1037.120.79.0.0", "Mac-827FB448E656EC26", // Intel Core i5-8259U @ 2.30 GHz
     "MacBook Pro", "1.0", "C02X1HACJHCD", "MacBook-Aluminum",
     { 0, 0, 0, 0, 0, 0 }, NULL, "j132", 0 },
   //MacBookPro15,3 / MacBook Pro (15-inch, 2019)
-  { "MacBookPro15,3", "MBP153.88Z.F000.B00.2003170137", "1037.100.359.0.0", "Mac-1E7E29AD0135F9BC", // Intel Core i9-9980HK @ 2.40 GHz
+  { "MacBookPro15,3", "MBP153.88Z.F000.B00.2004232100", "1037.120.79.0.0", "Mac-1E7E29AD0135F9BC", // Intel Core i9-9980HK @ 2.40 GHz
     "MacBook Pro", "1.0", "C02X1HACLVCG", "MacBook-Aluminum",
     { 0, 0, 0, 0, 0, 0 }, NULL, "j780", 0 },
   //MacBookPro15,4 / MacBook Pro (13-inch, 2019, Two Thunderbolt 3 ports)
-  { "MacBookPro15,4", "MBP154.88Z.F000.B00.2003170058", "1037.100.359.0.0", "Mac-53FDB3D8DB8CA971", // Intel Core i7-8557U @ 1.70 GHz
+  { "MacBookPro15,4", "MBP154.88Z.F000.B00.2004232040", "1037.120.79.0.0", "Mac-53FDB3D8DB8CA971", // Intel Core i7-8557U @ 1.70 GHz
     "MacBook Pro", "1.0", "FVFYXHACL411", "MacBook-Aluminum",
     { 0, 0, 0, 0, 0, 0 }, NULL, "j213", 0 },
   //MacBookPro16,1 / MacBook Pro (16-inch, 2019)
-  { "MacBookPro16,1", "MBP161.88Z.F000.B00.2003170228", "1037.100.359.0.0", "Mac-E1008331FDC96864", // Intel Core i9-9980HK @ 2.40 GHz
+  { "MacBookPro16,1", "MBP161.88Z.F000.B00.2004232153", "1037.120.79.0.0", "Mac-E1008331FDC96864", // Intel Core i9-9980HK @ 2.40 GHz
     "MacBook Pro", "1.0", "C02ZPHACPG8W", "MacBook-Aluminum",
     { 0, 0, 0, 0, 0, 0 }, NULL, "j152f", 0 },
+  //MacBookPro16,2 / MacBook Pro (13-inch, 2020, Four Thunderbolt 3 ports)
+  { "MacBookPro16,2", "MBP162.88Z.F000.B00.2005050534", "1037.120.82.0.0", "Mac-5F9802EFE386AA28", // Intel Core i7-1068NG7 @ 2.30 GHz
+    "MacBook Pro", "1.0", "C02CLHACML7H", "MacBook-Aluminum",
+    { 0, 0, 0, 0, 0, 0 }, NULL, "j214k", 0 },
+  //MacBookPro16,3 / MacBook Pro (13-inch, 2020, Two Thunderbolt 3 ports)
+  { "MacBookPro16,3", "MBP163.88Z.F000.B00.2005050334", "1037.120.82.0.0", "Mac-E7203C0F68AA0004", // Intel Core i7-8557U @ 1.70 GHz
+    "MacBook Pro", "1.0", "C02CJHACP3XY", "MacBook-Aluminum",
+    { 0, 0, 0, 0, 0, 0 }, NULL, "J223", 0 },
   //MacBookAir1,1 / MacBook Air (Original)
   { "MacBookAir1,1", "MBA11.88Z.00BB.B03.0803171226", NULL, "Mac-F42C8CC8", // Intel Core 2 Duo P7500 @ 1.60 GHz
     "MacBook Air", "1.0", "W864947A18X", "Air-Enclosure",
@@ -324,15 +332,15 @@ PLATFORMDATA ApplePlatformData[] =
     "MacBook Air", "1.0", "C02Q1HACG940", "Air-Enclosure",
     { 0x02, 0x27, 0x0f, 0, 0, 0x02 },  "j113", "j113", 0xf0a008 },
   //MacBookAir8,1 / MacBook Air (Retina, 13-inch, 2018)
-  { "MacBookAir8,1", "MBA81.88Z.F000.B00.2003170019", "1037.100.359.0.0", "Mac-827FAC58A8FDFA22", // Intel Core i5-8210Y @ 1.60 GHz
+  { "MacBookAir8,1", "MBA81.88Z.F000.B00.2004232004", "1037.120.79.0.0", "Mac-827FAC58A8FDFA22", // Intel Core i5-8210Y @ 1.60 GHz
     "MacBook Air", "1.0", "FVFXJHACJK77", "Air-Enclosure",
     { 0, 0, 0, 0, 0, 0 }, NULL, "j140k", 0 },
   //MacBookAir8,2 / MacBook Air (Retina, 13-inch, 2019)
-  { "MacBookAir8,2", "MBA82.88Z.F000.B00.2003170153", "1037.100.359.0.0", "Mac-226CB3C6A851A671", // Intel Core i5-8210Y @ 1.60 GHz
+  { "MacBookAir8,2", "MBA82.88Z.F000.B00.2004232118", "1037.120.79.0.0", "Mac-226CB3C6A851A671", // Intel Core i5-8210Y @ 1.60 GHz
     "MacBook Air", "1.0", "FVFXJHACLYWM", "Air-Enclosure",
     { 0, 0, 0, 0, 0, 0 }, NULL, "j140a", 0 },
   //MacBookAir9,1 / MacBook Air (Retina, 13-inch, 2020)
-  { "MacBookAir9,1", "J230K.88Z.F000.B00.2003170036", "1037.100.359.0.0", "Mac-0CFF9C7C2B63DF8D", // Intel Core i5-1030NG7 @ 1.10 GHz
+  { "MacBookAir9,1", "MBA91.88Z.F000.B00.2004232020", "1037.120.79.0.0", "Mac-0CFF9C7C2B63DF8D", // Intel Core i5-1030NG7 @ 1.10 GHz
     "MacBook Air", "1.0", "FVFCCHACMNHP", "Air-Enclosure",
     { 0, 0, 0, 0, 0, 0 }, NULL, "J230K", 0 },
   //Macmini1,1 / Mac mini (Early 2006)
@@ -376,7 +384,7 @@ PLATFORMDATA ApplePlatformData[] =
     "Mac mini", "1.0", "C02NN7NHG1J0", "Mini-Aluminum",
     { 0x02, 0x24, 0x0f, 0, 0, 0x32 },  "j64", "j64", 0xf04008 },
   //Macmini8,1 / Mac mini (2018)
-  { "Macmini8,1", "MM81.88Z.F000.B00.2003170108", "1037.100.359.0.0", "Mac-7BA5B2DFE22DDD8C", // Intel Core i7-8700B @ 3.20 GHz
+  { "Macmini8,1", "MM81.88Z.F000.B00.2004232041", "1037.120.79.0.0", "Mac-7BA5B2DFE22DDD8C", // Intel Core i7-8700B @ 3.20 GHz
     "Mac mini", "1.0", "C07XL9WEJYVX", "Mini-Aluminum",
     { 0, 0, 0, 0, 0, 0 }, NULL, "j174", 0 },
   //iMac4,1 / iMac (20-inch, Early 2006)
@@ -500,7 +508,7 @@ PLATFORMDATA ApplePlatformData[] =
     "iMac", "1.0", "C02Y9HACJWDW", "iMac-Aluminum",
     { 0x02, 0x47, 0x0f, 0, 0, 0x03 },  "j138_9", "j138", 0xf0d009 },
   //iMacPro1,1 /iMac Pro (2017)
-  { "iMacPro1,1", "IMP11.88Z.F000.B00.2003170108", "1037.100.359.0.0", "Mac-7BA5B2D9E42DDD94", // Intel Xeon W-2140B CPU @ 3.20 GHz
+  { "iMacPro1,1", "IMP11.88Z.F000.B00.2004232041", "1037.120.79.0.0", "Mac-7BA5B2D9E42DDD94", // Intel Xeon W-2140B CPU @ 3.20 GHz
     "iMac Pro", "1.0", "C02VVHACHX87", "iMacPro-Aluminum",
     { 0, 0, 0, 0, 0, 0 }, NULL, "j137", 0 },
   //MacPro1,1 / Mac Pro
@@ -528,7 +536,7 @@ PLATFORMDATA ApplePlatformData[] =
     "MacPro", "1.0", "F5KLA770F9VM", "Pro-Enclosure",
     { 0x02, 0x20, 0x0f, 0, 0, 0x18 },  "j90", "j90", 0xf0f006 },
   //MacPro7,1 / Mac Pro (2019)
-  { "MacPro7,1", "MP71.88Z.F000.B00.2003170019", "1037.100.359.0.0", "Mac-27AD2F918AE68F61", // Intel Xeon W-3245M CPU @ 3.20 GHz
+  { "MacPro7,1", "MP71.88Z.F000.B00.2004232004", "1037.120.79.0.0", "Mac-27AD2F918AE68F61", // Intel Xeon W-3245M CPU @ 3.20 GHz
     "MacPro", "1.0", "F5KZNHACP7QM", "Pro-Enclosure",
     { 0, 0, 0, 0, 0, 0 }, NULL, "j16O", 0 },
   //Xserve1,1 / Xserve (Late 2006)
@@ -725,6 +733,10 @@ VOID SetDMISettingsForModel(MACHINE_TYPES Model, BOOLEAN Redefine)
     case iMac192:
       gFwFeatures             = 0xFD8FF576;
       break;
+    case MacBookPro162:
+    case MacBookPro163:
+      gFwFeatures             = 0xFDAFF066;
+      break;
 
     // Verified list from Users
     case MacBookAir31:
@@ -843,6 +855,10 @@ VOID SetDMISettingsForModel(MACHINE_TYPES Model, BOOLEAN Redefine)
     case MacMini81:
       gFwFeaturesMask         = 0xFFDFFF7F;
       break;
+    case MacBookPro162:
+    case MacBookPro163:
+      gFwFeaturesMask         = 0xFFFFFF7F;
+      break;
 
     // Verified list from Users
     case MacBook61:
@@ -950,6 +966,10 @@ VOID SetDMISettingsForModel(MACHINE_TYPES Model, BOOLEAN Redefine)
     case iMac192:
       gPlatformFeature        = 0x22;
       break;
+    case MacBookPro162:
+    case MacBookPro163:
+      gPlatformFeature        = 0x32;
+      break;
     case MacBookAir81:
     case MacBookAir82:
     case MacBookAir91:
@@ -1034,6 +1054,8 @@ VOID SetDMISettingsForModel(MACHINE_TYPES Model, BOOLEAN Redefine)
     case MacBookPro153:
     case MacBookPro154:
     case MacBookPro161:
+    case MacBookPro162:
+    case MacBookPro163:
     case MacBookAir71:
     case MacBookAir72:
     case MacBookAir81:

rEFIt_UEFI/Platform/platformdata.h

@@ -62,6 +62,8 @@ typedef enum {
   MacBookPro153,
   MacBookPro154,
   MacBookPro161,
+  MacBookPro162,
+  MacBookPro163,
   MacBookAir11,
   MacBookAir21,
   MacBookAir31,