Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix guacamoleb #375

Merged
merged 7 commits into from
Jan 22, 2024
Merged

Fix guacamoleb #375

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
95b7772
guacamoleb: use guacamoleb files
NetuserPRO Jan 21, 2024
a15b313
guacamoleb: Enable A/B slots
NetuserPRO Jan 21, 2024
6105f96
guacamoleb: downgrade mkbootimg config to OOS10 (OOS12 is broken)
NetuserPRO Jan 21, 2024
49651f3
guacamoleb: Add downstream dtb from OOS10
NetuserPRO Jan 22, 2024
b7c0fba
guacamoleb: Add DSDT.aml
NetuserPRO Jan 22, 2024
d8f6dc1
guacamoleb: minor guacamoleb.fdf.inc fixes
NetuserPRO Jan 22, 2024
24746b6
EFI_Binaries: update submodule
NetuserPRO Jan 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Platform/EFI_Binaries
Open in desktop
Submodule EFI_Binaries updated from b2bc46 to d097b8
Binary file modified Platform/Oneplus/sm8150/AcpiTables/guacamoleb/DSDT.aml
View file
Open in desktop
Binary file not shown.
Binary file modified Platform/Oneplus/sm8150/FdtBlob_compat/guacamoleb.dtb
View file
Open in desktop
Binary file not shown.
4 changes: 3 additions & 1 deletion Platform/Oneplus/sm8150/guacamoleb.dsc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,13 @@
SKUID_IDENTIFIER = DEFAULT
FLASH_DEFINITION = Platform/Qualcomm/sm8150/sm8150.fdf
DEVICE_DXE_FV_COMPONENTS = Platform/Oneplus/sm8150/guacamoleb.fdf.inc
# Enable A/B Slot Environment
AB_SLOTS_SUPPORT = TRUE

!include Platform/Qualcomm/sm8150/sm8150.dsc

[BuildOptions.common]
GCC:*_*_AARCH64_CC_FLAGS = -DENABLE_SIMPLE_INIT -DENABLE_LINUX_SIMPLE_MASS_STORAGE
GCC:*_*_AARCH64_CC_FLAGS = -DAB_SLOTS_SUPPORT=1 -DENABLE_SIMPLE_INIT -DENABLE_LINUX_SIMPLE_MASS_STORAGE

[PcdsFixedAtBuild.common]
gQcomTokenSpaceGuid.PcdMipiFrameBufferWidth|1080
Expand Down
18 changes: 9 additions & 9 deletions Platform/Oneplus/sm8150/guacamoleb.fdf.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
// per-device BSP DXEs (use from op7 pro)
// per-device BSP DXEs
FILE DRIVER = 8e9bd160-b184-11df-94e2-0800200c9a66 {
SECTION DXE_DEPEX = Platform/EFI_Binaries/Drivers/sm8150/DALSys/DALSys.depex
SECTION PE32 = Platform/EFI_Binaries/Drivers/Devices/guacamole/DALSys/DALSys.efi
SECTION PE32 = Platform/EFI_Binaries/Drivers/Devices/guacamoleb/DALSys/DALSys.efi
SECTION UI = "DALSys"
}

FILE DRIVER = 5bd181db-0487-4f1a-ae73-820e165611b3 {
SECTION DXE_DEPEX = Platform/EFI_Binaries/Drivers/sm8150/ButtonsDxe/ButtonsDxe.depex
SECTION PE32 = Platform/EFI_Binaries/Drivers/Devices/guacamole/ButtonsDxe/ButtonsDxe.efi
SECTION PE32 = Platform/EFI_Binaries/Drivers/Devices/guacamoleb/ButtonsDxe/ButtonsDxe.efi
SECTION UI = "ButtonsDxe"
}

FILE DRIVER = 11faed4c-b21f-4d88-8e48-c4c28a1e50df {
SECTION DXE_DEPEX = Platform/EFI_Binaries/Drivers/sm8150/WP_Binaries/UsbPwrCtrlDxe/UsbPwrCtrlDxe.depex
SECTION PE32 = Platform/EFI_Binaries/Drivers/Devices/guacamole/UsbPwrCtrlDxe/UsbPwrCtrlDxe.efi
SECTION UI = "UsbPwrCtrlDxe"
SECTION DXE_DEPEX = Platform/EFI_Binaries/Drivers/sm8150/WP_Binaries/UsbPwrCtrlDxe/UsbPwrCtrlDxe.depex
SECTION PE32 = Platform/EFI_Binaries/Drivers/Devices/guacamoleb/UsbPwrCtrlDxe/UsbPwrCtrlDxe.efi
SECTION UI = "UsbPwrCtrlDxe"
}

// ACPI Tables (use from op7 pro)
// ACPI Tables
FILE FREEFORM = 7E374E25-8E01-4FEE-87F2-390C23C606CD {
# Customized DSDT
SECTION RAW = Platform/Oneplus/sm8150/AcpiTables/guacamole/DSDT.aml
SECTION RAW = Platform/Oneplus/sm8150/AcpiTables/guacamoleb/DSDT.aml
# Common Tables
SECTION RAW = Silicon/Qualcomm/sm8150/AcpiTables/BuiltIn/APIC.aml
# SECTION RAW = Silicon/Qualcomm/sm8150/AcpiTables/BuiltIn/BERT.aml
Expand All @@ -39,7 +39,7 @@ FILE FREEFORM = 7E374E25-8E01-4FEE-87F2-390C23C606CD {
SECTION UI = "AcpiTables"
}

// Mainline device tree blob (use from sm-8150 mainlane - https://gitlab.com/sm8150-mainline/linux/-/blob/sm8150/5.17/arch/arm64/boot/dts/qcom/sm8150-oneplus-hotdogb.dts)
// Mainline device tree blob (use from sm-8150 mainline - https://gitlab.com/sm8150-mainline/linux/-/blob/sm8150/5.17/arch/arm64/boot/dts/qcom/sm8150-oneplus-hotdogb.dts)
FILE FREEFORM = 25462CDA-221F-47DF-AC1D-259CFAA4E326 {
SECTION RAW = Platform/Oneplus/sm8150/FdtBlob/sm8150-oneplus-hotdogb.dtb
}
4 changes: 2 additions & 2 deletions configs/devices/guacamoleb.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ VENDOR_NAME="Oneplus"
PLATFORM_NAME="guacamoleb"

# mkbootimg config
BOOTIMG_OS_PATCH_LEVEL="2022-12"
BOOTIMG_OS_VERSION=13.0.0
BOOTIMG_OS_PATCH_LEVEL="2021-01"
BOOTIMG_OS_VERSION=10.0.0
BOOTIMG_HEADER_VERSION=1