From 2161c9aaa0de529d9d2fc5a0f3d9ece955081fba Mon Sep 17 00:00:00 2001
From: Freak2112 <64154433+mhtygt211227@users.noreply.github.com>
Date: Wed, 25 Aug 2021 17:25:35 +0300
Subject: [PATCH] Revert "Revert "Merge branch 'master' of
 https://github.com/edk2-porting/edk2-sdm845""

This reverts commit 3c100bd40e73fb8a757217c1c7c750fa429c5f78.
---
 sdm845Pkg/AcpiTables          |  2 +-
 sdm845Pkg/Devices/nx616j.dsc  |  2 +-
 sdm845Pkg/Devices/perseus.fdf | 12 ------------
 3 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/sdm845Pkg/AcpiTables b/sdm845Pkg/AcpiTables
index 02d7555..3bb5f20 160000
--- a/sdm845Pkg/AcpiTables
+++ b/sdm845Pkg/AcpiTables
@@ -1 +1 @@
-Subproject commit 02d75555a6dee7e8c628db7b0b71e8afe51dd6c9
+Subproject commit 3bb5f20cc45017322e2e9cfddbbc443dd638ac7b
diff --git a/sdm845Pkg/Devices/nx616j.dsc b/sdm845Pkg/Devices/nx616j.dsc
index c7b3e33..634f87f 100644
--- a/sdm845Pkg/Devices/nx616j.dsc
+++ b/sdm845Pkg/Devices/nx616j.dsc
@@ -7,7 +7,7 @@
   SUPPORTED_ARCHITECTURES        = AARCH64
   BUILD_TARGETS                  = DEBUG|RELEASE
   SKUID_IDENTIFIER               = DEFAULT
-  FLASH_DEFINITION               = sdm845Pkg/Devices/845.fdf
+  FLASH_DEFINITION               = sdm845Pkg/Devices/dipper.fdf
 
 !include sdm845Pkg/sdm845Pkg.dsc
 
diff --git a/sdm845Pkg/Devices/perseus.fdf b/sdm845Pkg/Devices/perseus.fdf
index 3085df3..6eac1df 100644
--- a/sdm845Pkg/Devices/perseus.fdf
+++ b/sdm845Pkg/Devices/perseus.fdf
@@ -219,12 +219,6 @@ APRIORI DXE {
     SECTION UI = "ClockDxe"
   }
 
-  FILE DRIVER = 1B52138D-3FA3-4E50-B958-20887353F809 {
-    SECTION DXE_DEPEX = sdm845Pkg/Binary/845/CPRDxe/CPRDxe.depex
-    SECTION PE32 = sdm845Pkg/Binary/845/CPRDxe/CPRDxe.efi
-    SECTION UI = "CPRDxe"
-  }
-
   FILE DRIVER = AF9763A2-033B-4109-8E17-56A98D380C92 {
     SECTION DXE_DEPEX = sdm845Pkg/Binary/845/DALTLMM/DALTLMM.depex
     SECTION PE32 = sdm845Pkg/Binary/845/DALTLMM/DALTLMM.efi
@@ -410,12 +404,6 @@ APRIORI DXE {
     SECTION UI = "ClockDxe"
   }
 
-  FILE DRIVER = 1B52138D-3FA3-4E50-B958-20887353F809 {
-    SECTION DXE_DEPEX = sdm845Pkg/Binary/845/CPRDxe/CPRDxe.depex
-    SECTION PE32 = sdm845Pkg/Binary/845/CPRDxe/CPRDxe.efi
-    SECTION UI = "CPRDxe"
-  }
-
   FILE DRIVER = AF9763A2-033B-4109-8E17-56A98D380C92 {
     SECTION DXE_DEPEX = sdm845Pkg/Binary/845/DALTLMM/DALTLMM.depex
     SECTION PE32 = sdm845Pkg/Binary/845/DALTLMM/DALTLMM.efi
-- 
2.45.2