Enable BootSlotDxe for enchilada

diff --git a/sdm845Pkg/Devices/enchilada-8g.dsc b/sdm845Pkg/Devices/enchilada-8g.dsc
index 3be265cc11ac14daba6ac0888bb8aa4a6d17f142..b219e94deb0d98faa4c33e87611395da4c020971 100644 (file)
--- a/sdm845Pkg/Devices/enchilada-8g.dsc
+++ b/sdm845Pkg/Devices/enchilada-8g.dsc
@@ -10,10 +10,13 @@
   SKUID_IDENTIFIER               = DEFAULT
   FLASH_DEFINITION               = sdm845Pkg/Devices/enchilada.fdf
 
+  # Enable A/B Slot Environment
+  DEFINE AB_SLOTS_SUPPORT        = TRUE
+
 !include sdm845Pkg/sdm845Pkg.dsc
 
 [BuildOptions.common]
-  GCC:*_*_AARCH64_CC_FLAGS = -DMEMORY_8G=1
+  GCC:*_*_AARCH64_CC_FLAGS = -DMEMORY_8G=1 -DAB_SLOTS_SUPPORT=1
 
 [PcdsFixedAtBuild.common]
   # System Memory (7GB)

diff --git a/sdm845Pkg/Devices/enchilada.dsc b/sdm845Pkg/Devices/enchilada.dsc
index c609bfeeb7f65b6db3f63c8ee2cc9196f1eb75b0..afdfbdfe6212af76793686385527fc2aba389f75 100644 (file)
--- a/sdm845Pkg/Devices/enchilada.dsc
+++ b/sdm845Pkg/Devices/enchilada.dsc
@@ -9,8 +9,14 @@
   SKUID_IDENTIFIER               = DEFAULT
   FLASH_DEFINITION               = sdm845Pkg/Devices/enchilada.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
+
 [PcdsFixedAtBuild.common]
   # System Memory (5GB)                    
   gArmTokenSpaceGuid.PcdSystemMemorySize|0x15AE00000

diff --git a/sdm845Pkg/Devices/enchilada.fdf b/sdm845Pkg/Devices/enchilada.fdf
index 6f06b8b8f73f2c48a4b844eadc280d8ee511523c..72202d7012fd34ce0f2fde7c29eeda04a4068425 100644 (file)
--- a/sdm845Pkg/Devices/enchilada.fdf
+++ b/sdm845Pkg/Devices/enchilada.fdf
@@ -586,7 +586,13 @@ APRIORI DXE {
   #
   # 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)
 
 [FV.FVMAIN_COMPACT]
 FvAlignment        = 8

diff --git a/sdm845Pkg/Devices/fajita.fdf b/sdm845Pkg/Devices/fajita.fdf
index 26b54c5f90fdcc1a221de22c5d9a98efc5450971..4e400708c25068f369e26d31ecd83fe2b85de995 100644 (file)
--- a/sdm845Pkg/Devices/fajita.fdf
+++ b/sdm845Pkg/Devices/fajita.fdf
@@ -588,7 +588,7 @@ APRIORI DXE {
   INF sdm845Pkg/Application/SwitchSlotsApp/SwitchSlotsApp.inf
   INF sdm845Pkg/Drivers/BootSlotDxe/BootSlotDxe.inf
 !else
-  # Old unstable solution
+  # Old unstable solution, remove once BootSlotDxe fully tested
   INF sdm845Pkg/Drivers/Op6tSlotDxe/Op6tSlotDxe.inf
 !endif #$(AB_SLOTS_SUPPORT)