From: Xilin Wu <wuxilin123@gmail.com>
Date: 星期一, 22 Aug 2022 14:23:31 +0000 (+0800)
Subject: zs600kl: Include preliminary dtb to enable mass-storage
X-Git-Url: https://git.renegade-project.org/?a=commitdiff_plain;h=e18c2191b7f3f5af58c6ce717f316011bfec7b6d;p=edk2-sdm845.git

zs600kl: Include preliminary dtb to enable mass-storage
---

diff --git a/sdm845Pkg/Binary b/sdm845Pkg/Binary
index 05531aa..4b2d878 160000
--- a/sdm845Pkg/Binary
+++ b/sdm845Pkg/Binary
@@ -1 +1 @@
-Subproject commit 05531aaf07bd68ea6cc3d0af9cb7fa982a2332e1
+Subproject commit 4b2d8782de2dbdf5dff0ad237defca27467ea319
diff --git a/sdm845Pkg/Devices/zs600kl.dsc b/sdm845Pkg/Devices/zs600kl.dsc
index 31c0014..73d8354 100644
--- a/sdm845Pkg/Devices/zs600kl.dsc
+++ b/sdm845Pkg/Devices/zs600kl.dsc
@@ -12,7 +12,7 @@
 !include sdm845Pkg/sdm845Pkg.dsc
 
 [BuildOptions.common]
-  GCC:*_*_AARCH64_CC_FLAGS = -DENABLE_SIMPLE_INIT
+  GCC:*_*_AARCH64_CC_FLAGS = -DENABLE_SIMPLE_INIT -DENABLE_LINUX_SIMPLE_MASS_STORAGE
 
 [PcdsFixedAtBuild.common]
 
diff --git a/sdm845Pkg/Devices/zs600kl.fdf b/sdm845Pkg/Devices/zs600kl.fdf
index 9821c27..0f82403 100644
--- a/sdm845Pkg/Devices/zs600kl.fdf
+++ b/sdm845Pkg/Devices/zs600kl.fdf
@@ -256,8 +256,8 @@ APRIORI DXE {
   INF MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf
 
   FILE DRIVER = 5bd181db-0487-4f1a-ae73-820e165611b3 {
-    SECTION DXE_DEPEX = sdm845Pkg/Binary/Polaris/ButtonsDxe/ButtonsDxe.depex
-    SECTION PE32 = sdm845Pkg/Binary/Polaris/ButtonsDxe/ButtonsDxe.efi
+    SECTION DXE_DEPEX = sdm845Pkg/Binary/zs600kl/ButtonsDxe/ButtonsDxe.depex
+    SECTION PE32 = sdm845Pkg/Binary/zs600kl/ButtonsDxe/ButtonsDxe.efi
     SECTION UI = "ButtonsDxe"
   }
 
@@ -496,8 +496,8 @@ APRIORI DXE {
   }
 
   FILE DRIVER = 5bd181db-0487-4f1a-ae73-820e165611b3 {
-    SECTION DXE_DEPEX = sdm845Pkg/Binary/Polaris/ButtonsDxe/ButtonsDxe.depex
-    SECTION PE32 = sdm845Pkg/Binary/Polaris/ButtonsDxe/ButtonsDxe.efi
+    SECTION DXE_DEPEX = sdm845Pkg/Binary/zs600kl/ButtonsDxe/ButtonsDxe.depex
+    SECTION PE32 = sdm845Pkg/Binary/zs600kl/ButtonsDxe/ButtonsDxe.efi
     SECTION UI = "ButtonsDxe"
   }
 
@@ -565,9 +565,9 @@ APRIORI DXE {
   #
   INF EmbeddedPkg/Drivers/DtPlatformDxe/DtPlatformDxe.inf
 
-#   FILE FREEFORM = 25462CDA-221F-47DF-AC1D-259CFAA4E326 {
-#     SECTION RAW = sdm845Pkg/FdtBlob/sdm845-xiaomi-polaris.dtb
-#   }
+  FILE FREEFORM = 25462CDA-221F-47DF-AC1D-259CFAA4E326 {
+    SECTION RAW = sdm845Pkg/FdtBlob/sdm845-asus-zs600kl.dtb
+  }
 
   #
   # SMBIOS Support
diff --git a/sdm845Pkg/FdtBlob/sdm845-asus-zs600kl.dtb b/sdm845Pkg/FdtBlob/sdm845-asus-zs600kl.dtb
new file mode 100755
index 0000000..6e1f61e
Binary files /dev/null and b/sdm845Pkg/FdtBlob/sdm845-asus-zs600kl.dtb differ