Enable SimpleInit and A/B slot switching for LG845

diff --git a/device_specific/judyln.dtb b/device_specific/judyln.dtb
index 18d76c7447d8215f6cd83dfe67c793ec8065b9cd..28b577886840ac795ac4b1766bc12677eba9c6f8 100644 (file)
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 f2d3c2d8a4aa6ef991e5a99c8810a027491f698e..6d360a0f08b6539b9cbca9d4896c92b5fb82ef18 100644 (file)
--- 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 81d52002019850b97b3995bd8accad2f625db775..94e3e676be1f16f7516e176e11d243e4a82e3e6e 100644 (file)
--- 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 a6a7963fe85520a31b0f08cdb850eb83a4ae7cfb..753fbce52c204d3147b4b4a254e0c734387d78c7 100644 (file)
--- 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 6f5305039a1ddc435ad88da9b4d0c45e48b1b008..52acf68c41ac82233e6a313e02b734eb9c5da819 100644 (file)
--- 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 2a63c6b80e5e862dcb5f7e81bf3cdec37eec2c7a..5a6c1100934ba94e87f14eeabf508c34bcfd74ec 100644 (file)
--- 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 f0080133cc0060aa1702bd0d463f244d4227bc76..a2ebe439551e3cecefc1ce9eeee668a2fb9729f6 100644 (file)
--- 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