From: AKAsaliza <33549290+AKAsaliza@users.noreply.github.com>
Date: 星期三, 22 Jun 2022 06:48:24 +0000 (+0900)
Subject: Enable SimpleInit and A/B slot switching for LG845
X-Git-Url: https://git.renegade-project.org/?a=commitdiff_plain;h=6bb67093d8875b0fe1f81f42361b73016572dc9b;p=edk2-sdm845.git

Enable SimpleInit and A/B slot switching for LG845
---

diff --git a/device_specific/judyln.dtb b/device_specific/judyln.dtb
index 18d76c7..28b5778 100644
Binary files a/device_specific/judyln.dtb and b/device_specific/judyln.dtb differ
diff --git a/sdm845Pkg/Devices/judyln.dsc b/sdm845Pkg/Devices/judyln.dsc
index f2d3c2d..6d360a0 100644
--- a/sdm845Pkg/Devices/judyln.dsc
+++ b/sdm845Pkg/Devices/judyln.dsc
@@ -9,16 +9,22 @@
   SKUID_IDENTIFIER               = DEFAULT
   FLASH_DEFINITION               = sdm845Pkg/Devices/judyln.fdf
   
+  # Enable A/B Slot Environment
+  DEFINE AB_SLOTS_SUPPORT        = TRUE
+
 !include sdm845Pkg/sdm845Pkg.dsc
 
+[BuildOptions.common]
+  GCC:*_*_AARCH64_CC_FLAGS = -DAB_SLOTS_SUPPORT=1 -DENABLE_SIMPLE_INIT -DENABLE_LINUX_SIMPLE_MASS_STORAGE
+
 [PcdsFixedAtBuild.common]
 
   gsdm845PkgTokenSpaceGuid.PcdMipiFrameBufferWidth|1440
   gsdm845PkgTokenSpaceGuid.PcdMipiFrameBufferHeight|3120
 
   # Simple Init
-  gSimpleInitTokenSpaceGuid.PcdGuiDefaultDPI|440
+  gSimpleInitTokenSpaceGuid.PcdGuiDefaultDPI|550
 
   gsdm845PkgTokenSpaceGuid.PcdDeviceVendor|"LG"
   gsdm845PkgTokenSpaceGuid.PcdDeviceProduct|"G7 ThinQ"
-  gsdm845PkgTokenSpaceGuid.PcdDeviceCodeName|"Judyln"
+  gsdm845PkgTokenSpaceGuid.PcdDeviceCodeName|"Judyln"
\ No newline at end of file
diff --git a/sdm845Pkg/Devices/judyln.fdf b/sdm845Pkg/Devices/judyln.fdf
index 81d5200..94e3e67 100644
--- a/sdm845Pkg/Devices/judyln.fdf
+++ b/sdm845Pkg/Devices/judyln.fdf
@@ -597,6 +597,16 @@ APRIORI DXE {
   INF MdeModulePkg/Application/UiApp/UiApp.inf
   INF sdm845Pkg/Drivers/LogoDxe/LogoDxe.inf
 
+  #
+  # OnePlus 6(T) A/B Slot Support
+  #
+!ifdef $(AB_SLOTS_SUPPORT)
+  INF sdm845Pkg/Application/SwitchSlotsApp/SwitchSlotsApp.inf
+  INF sdm845Pkg/Drivers/BootSlotDxe/BootSlotDxe.inf
+!else
+  # Old unstable solution, remove once BootSlotDxe fully tested
+  INF sdm845Pkg/Drivers/Op6tSlotDxe/Op6tSlotDxe.inf
+!endif #$(AB_SLOTS_SUPPORT)
 
   #
   # Simple Init GUI
diff --git a/sdm845Pkg/Devices/judyp.dsc b/sdm845Pkg/Devices/judyp.dsc
index a6a7963..753fbce 100644
--- a/sdm845Pkg/Devices/judyp.dsc
+++ b/sdm845Pkg/Devices/judyp.dsc
@@ -9,14 +9,22 @@
   SKUID_IDENTIFIER               = DEFAULT
   FLASH_DEFINITION               = sdm845Pkg/Devices/judyp.fdf
 
+  # Enable A/B Slot Environment
+  DEFINE AB_SLOTS_SUPPORT        = TRUE
+
 !include sdm845Pkg/sdm845Pkg.dsc
 
+[BuildOptions.common]
+  GCC:*_*_AARCH64_CC_FLAGS = -DAB_SLOTS_SUPPORT=1 -DENABLE_SIMPLE_INIT -DENABLE_LINUX_SIMPLE_MASS_STORAGE
+
 [PcdsFixedAtBuild.common]
 
   gsdm845PkgTokenSpaceGuid.PcdMipiFrameBufferWidth|1440
   gsdm845PkgTokenSpaceGuid.PcdMipiFrameBufferHeight|2880
 
+  # Simple Init
+  gSimpleInitTokenSpaceGuid.PcdGuiDefaultDPI|550
+
   gsdm845PkgTokenSpaceGuid.PcdDeviceVendor|"LG"
   gsdm845PkgTokenSpaceGuid.PcdDeviceProduct|"V35 ThinQ"
-  gsdm845PkgTokenSpaceGuid.PcdDeviceCodeName|"Judyp"
-
+  gsdm845PkgTokenSpaceGuid.PcdDeviceCodeName|"Judyp"
\ No newline at end of file
diff --git a/sdm845Pkg/Devices/judyp.fdf b/sdm845Pkg/Devices/judyp.fdf
index 6f53050..52acf68 100644
--- a/sdm845Pkg/Devices/judyp.fdf
+++ b/sdm845Pkg/Devices/judyp.fdf
@@ -597,6 +597,16 @@ APRIORI DXE {
   INF MdeModulePkg/Application/UiApp/UiApp.inf
   INF sdm845Pkg/Drivers/LogoDxe/LogoDxe.inf
 
+  #
+  # OnePlus 6(T) A/B Slot Support
+  #
+!ifdef $(AB_SLOTS_SUPPORT)
+  INF sdm845Pkg/Application/SwitchSlotsApp/SwitchSlotsApp.inf
+  INF sdm845Pkg/Drivers/BootSlotDxe/BootSlotDxe.inf
+!else
+  # Old unstable solution, remove once BootSlotDxe fully tested
+  INF sdm845Pkg/Drivers/Op6tSlotDxe/Op6tSlotDxe.inf
+!endif #$(AB_SLOTS_SUPPORT)
 
   #
   # Simple Init GUI
diff --git a/sdm845Pkg/Devices/judypn.dsc b/sdm845Pkg/Devices/judypn.dsc
index 2a63c6b..5a6c110 100644
--- a/sdm845Pkg/Devices/judypn.dsc
+++ b/sdm845Pkg/Devices/judypn.dsc
@@ -9,14 +9,22 @@
   SKUID_IDENTIFIER               = DEFAULT
   FLASH_DEFINITION               = sdm845Pkg/Devices/judypn.fdf
 
+  # Enable A/B Slot Environment
+  DEFINE AB_SLOTS_SUPPORT        = TRUE
+
 !include sdm845Pkg/sdm845Pkg.dsc
 
+[BuildOptions.common]
+  GCC:*_*_AARCH64_CC_FLAGS = -DAB_SLOTS_SUPPORT=1 -DENABLE_SIMPLE_INIT -DENABLE_LINUX_SIMPLE_MASS_STORAGE
+
 [PcdsFixedAtBuild.common]
 
   gsdm845PkgTokenSpaceGuid.PcdMipiFrameBufferWidth|1440
   gsdm845PkgTokenSpaceGuid.PcdMipiFrameBufferHeight|3120
 
+  # Simple Init
+  gSimpleInitTokenSpaceGuid.PcdGuiDefaultDPI|550
+
   gsdm845PkgTokenSpaceGuid.PcdDeviceVendor|"LG"
   gsdm845PkgTokenSpaceGuid.PcdDeviceProduct|"V40 ThinQ"
-  gsdm845PkgTokenSpaceGuid.PcdDeviceCodeName|"Judypn"
-
+  gsdm845PkgTokenSpaceGuid.PcdDeviceCodeName|"Judypn"
\ No newline at end of file
diff --git a/sdm845Pkg/Devices/judypn.fdf b/sdm845Pkg/Devices/judypn.fdf
index f008013..a2ebe43 100644
--- a/sdm845Pkg/Devices/judypn.fdf
+++ b/sdm845Pkg/Devices/judypn.fdf
@@ -597,6 +597,16 @@ APRIORI DXE {
   INF MdeModulePkg/Application/UiApp/UiApp.inf
   INF sdm845Pkg/Drivers/LogoDxe/LogoDxe.inf
 
+  #
+  # OnePlus 6(T) A/B Slot Support
+  #
+!ifdef $(AB_SLOTS_SUPPORT)
+  INF sdm845Pkg/Application/SwitchSlotsApp/SwitchSlotsApp.inf
+  INF sdm845Pkg/Drivers/BootSlotDxe/BootSlotDxe.inf
+!else
+  # Old unstable solution, remove once BootSlotDxe fully tested
+  INF sdm845Pkg/Drivers/Op6tSlotDxe/Op6tSlotDxe.inf
+!endif #$(AB_SLOTS_SUPPORT)
 
   #
   # Simple Init GUI