From c723feee20572fc8f982fbbd6e95b6751d28b327 Mon Sep 17 00:00:00 2001 From: Caramel Date: Mon, 30 Aug 2021 18:06:01 +0300 Subject: [PATCH] Enable BootSlotDxe for enchilada --- sdm845Pkg/Devices/enchilada-8g.dsc | 5 ++++- sdm845Pkg/Devices/enchilada.dsc | 6 ++++++ sdm845Pkg/Devices/enchilada.fdf | 6 ++++++ sdm845Pkg/Devices/fajita.fdf | 2 +- 4 files changed, 17 insertions(+), 2 deletions(-) diff --git a/sdm845Pkg/Devices/enchilada-8g.dsc b/sdm845Pkg/Devices/enchilada-8g.dsc index 3be265c..b219e94 100644 --- 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 c609bfe..afdfbdf 100644 --- 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 6f06b8b..72202d7 100644 --- 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 26b54c5..4e40070 100644 --- 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) -- 2.45.2