Revert "Revert "Merge branch 'master' of https://github.com/edk2-porting/edk2-sdm845""

This reverts commit 3c100bd40e73fb8a757217c1c7c750fa429c5f78.

diff --git a/sdm845Pkg/AcpiTables b/sdm845Pkg/AcpiTables
index 02d75555a6dee7e8c628db7b0b71e8afe51dd6c9..3bb5f20cc45017322e2e9cfddbbc443dd638ac7b 160000 (submodule)
--- 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 c7b3e33c50483da33ec2de592ab8e769a3d635ac..634f87fee3f425c82fded4fd1a8da351819765c0 100644 (file)
--- 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 3085df35f796a9f4449d386daa2487b2c24f9084..6eac1df95b07f87f0a036ed598d89c643b7e37a4 100644 (file)
--- 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