[pull] master from edk2-porting:master

.github/workflows/installer.yml

@@ -28,6 +28,13 @@ jobs:
           - cepheus
           - vayu-huaxing
           - vayu-tianma
+          # sm8250
+          - lmi
+          # sm8550
+          - fuxi
+          # sm7325
+          - lisa
+
 
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:

.github/workflows/main.yml

@@ -31,7 +31,9 @@ jobs:
           - cepheus
           - hotdog
           - guacamole
+          - guacamoleb
           # sdm845
+          - fajita
           - beryllium-ebbg
           - beryllium-tianma
           - polaris
@@ -50,12 +52,12 @@ jobs:
 
       - name: Install required packages
         run: |
-          sudo dpkg --add-architecture i386 
+          sudo dpkg --add-architecture i386
           wget -qO - https://dl.winehq.org/wine-builds/winehq.key | sudo apt-key add -
           sudo add-apt-repository ppa:cybermax-dexter/sdl2-backport
           sudo apt-add-repository "deb https://dl.winehq.org/wine-builds/ubuntu $(lsb_release -cs) main"
           sudo apt-get update
-          sudo apt-get -y install build-essential uuid-dev clang llvm iasl nasm gcc-aarch64-linux-gnu abootimg python3-distutils python3-pil python3-git gettext
+          sudo apt-get -y install build-essential uuid-dev clang llvm iasl nasm gcc-aarch64-linux-gnu abootimg python3-distutils python3-pil python3-git gettext libgcc-s1:i386 libstdc++6:i386
           sudo apt-get install --install-recommends winehq-stable
 
       - name: Build an image for ${{ matrix.device }}

Platform/Asus/sdm660/x00td.dsc

@@ -0,0 +1,28 @@
+[Defines]
+  VENDOR_NAME                    = ASUS
+  PLATFORM_NAME                  = x00td
+  PLATFORM_GUID                  = 28f1a3bf-193a-47e3-a7b9-5a435eaab2ee
+  PLATFORM_VERSION               = 0.1
+  DSC_SPECIFICATION              = 0x00010019
+  OUTPUT_DIRECTORY               = Build/$(PLATFORM_NAME)
+  SUPPORTED_ARCHITECTURES        = AARCH64
+  BUILD_TARGETS                  = DEBUG|RELEASE
+  SKUID_IDENTIFIER               = DEFAULT
+  FLASH_DEFINITION               = Platform/Qualcomm/sdm660/sdm660.fdf
+  DEVICE_DXE_FV_COMPONENTS       = Platform/Asus/sdm660/x00td.fdf.inc
+
+!include Platform/Qualcomm/sdm660/sdm660.dsc
+
+[BuildOptions.common]
+  GCC:*_*_AARCH64_CC_FLAGS = -DENABLE_SIMPLE_INIT -DENABLE_LINUX_SIMPLE_MASS_STORAGE
+
+[PcdsFixedAtBuild.common]
+  gQcomTokenSpaceGuid.PcdMipiFrameBufferWidth|1080
+  gQcomTokenSpaceGuid.PcdMipiFrameBufferHeight|2160
+
+  # Simple Init
+  gSimpleInitTokenSpaceGuid.PcdGuiDefaultDPI|420
+
+  gRenegadePkgTokenSpaceGuid.PcdDeviceVendor|"Asus"
+  gRenegadePkgTokenSpaceGuid.PcdDeviceProduct|"MaxProM1"
+  gRenegadePkgTokenSpaceGuid.PcdDeviceCodeName|"X00TD"

Platform/Asus/sdm660/x00td.fdf.inc

@@ -0,0 +1,16 @@
+// per-device BSP DXEs
+
+// ACPI Tables
+FILE FREEFORM = 7E374E25-8E01-4FEE-87F2-390C23C606CD {
+  SECTION RAW = Silicon/Qualcomm/sdm660/AcpiTables/DSDT/DSDT.aml
+  SECTION RAW = Silicon/Qualcomm/sdm660/AcpiTables/BuiltIn/CSRT.aml
+  SECTION RAW = Silicon/Qualcomm/sdm660/AcpiTables/BuiltIn/DBG2.aml
+  SECTION RAW = Silicon/Qualcomm/sdm660/AcpiTables/BuiltIn/FACS.aml
+  SECTION RAW = Silicon/Qualcomm/sdm660/AcpiTables/BuiltIn/FADT.aml
+  SECTION RAW = Silicon/Qualcomm/sdm660/AcpiTables/BuiltIn/GTDT.aml
+  SECTION RAW = Silicon/Qualcomm/sdm660/AcpiTables/BuiltIn/MADT.aml
+  SECTION RAW = Silicon/Qualcomm/sdm660/AcpiTables/BuiltIn/MCFG.aml
+  SECTION UI = "AcpiTables"
+}
+
+// Mainline device tree blob

Platform/LG/sm8150/betalm.fdf.inc

@@ -24,12 +24,6 @@ FILE DRIVER = f10f76db-42c1-533f-34a8-69be24653110 {
     SECTION UI = "SdccDxe"
   }
 
-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/sm8150/WP_Binaries/UsbPwrCtrlDxe/UsbPwrCtrlDxe.efi
-    SECTION UI = "UsbPwrCtrlDxe"
-}
-
 // ACPI Tables
 FILE FREEFORM = 7E374E25-8E01-4FEE-87F2-390C23C606CD {
 

Platform/LG/sm8150/flashlmdd.dsc

@@ -0,0 +1,39 @@
+[Defines]
+  VENDOR_NAME                    = LG
+  PLATFORM_NAME                  = flashlmdd
+  PLATFORM_GUID                  = 28f1a3bf-193a-47e3-a7b9-5a435eaab2ee
+  PLATFORM_VERSION               = 0.1
+  DSC_SPECIFICATION              = 0x00010019
+  OUTPUT_DIRECTORY               = Build/$(PLATFORM_NAME)
+  SUPPORTED_ARCHITECTURES        = AARCH64
+  BUILD_TARGETS                  = DEBUG|RELEASE
+  SKUID_IDENTIFIER               = DEFAULT
+  FLASH_DEFINITION               = Platform/Qualcomm/sm8150/sm8150.fdf
+  DEVICE_DXE_FV_COMPONENTS       = Platform/LG/sm8150/flashlmdd.fdf.inc
+
+!include Platform/Qualcomm/sm8150/sm8150.dsc
+
+[BuildOptions.common]
+  GCC:*_*_AARCH64_CC_FLAGS = -DENABLE_SIMPLE_INIT -DMEMMAP_LG_HACKS
+
+[PcdsFixedAtBuild.common]
+  gQcomTokenSpaceGuid.PcdMipiFrameBufferWidth|1440
+  gQcomTokenSpaceGuid.PcdMipiFrameBufferHeight|3120
+  # gQcomTokenSpaceGuid.PcdMipiFrameBufferAddress|0x9D200000
+
+  # Simple Init
+  gSimpleInitTokenSpaceGuid.PcdGuiDefaultDPI|355
+
+  gRenegadePkgTokenSpaceGuid.PcdDeviceVendor|"LG"
+  gRenegadePkgTokenSpaceGuid.PcdDeviceProduct|"V50 ThinQ"
+  gRenegadePkgTokenSpaceGuid.PcdDeviceCodeName|"flashlmdd"
+
+  # Synaptics Touchscren
+  #  gQcomTokenSpaceGuid.PcdTouchCtlrAddress|0x20
+  #  gQcomTokenSpaceGuid.PcdTouchCtlrResetPin|54
+  #  gQcomTokenSpaceGuid.PcdTouchCtlrIntPin|122
+  #  gQcomTokenSpaceGuid.PcdTouchCtlrI2cDevice|18
+  #  gQcomTokenSpaceGuid.PcdTouchMaxX|1080
+  #  gQcomTokenSpaceGuid.PcdTouchMaxY|2340
+  #  gQcomTokenSpaceGuid.PcdTouchCtlrVddPin|59
+  #  gQcomTokenSpaceGuid.PcdTouchCtlrVddIoPin|152

Platform/LG/sm8150/flashlmdd.fdf.inc

@@ -0,0 +1,57 @@
+// 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/mh2lm/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/mh2lm/ButtonsDxe/ButtonsDxe.efi
+    SECTION UI = "ButtonsDxe"
+}
+
+FILE DRIVER = f10f76db-42c1-533f-34a8-69be24653110 {
+    SECTION DXE_DEPEX = Platform/EFI_Binaries/Drivers/sm8150/SdccDxe/SdccDxe.depex
+    SECTION PE32 = Platform/EFI_Binaries/Drivers/sm8150/SdccDxe/SdccDxe.efi
+    SECTION UI = "SdccDxe"
+  }
+
+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/sm8150/WP_Binaries/UsbPwrCtrlDxe/UsbPwrCtrlDxe.efi
+    SECTION UI = "UsbPwrCtrlDxe"
+}
+
+// ACPI Tables
+FILE FREEFORM = 7E374E25-8E01-4FEE-87F2-390C23C606CD {
+
+# 	Customized DSDT
+    SECTION RAW = Platform/LG/sm8150/AcpiTables/flashlmdd/DSDT.aml
+# 	Common Tables
+	SECTION RAW = Silicon/Qualcomm/sm8150/AcpiTables/BuiltIn/APIC.aml
+# 	SECTION RAW = Silicon/Qualcomm/sm8150/AcpiTables/BuiltIn/BERT.aml
+# 	SECTION RAW = Silicon/Qualcomm/sm8150/AcpiTables/BuiltIn/BGRT.aml
+	SECTION RAW = Silicon/Qualcomm/sm8150/AcpiTables/BuiltIn/CSRT.aml
+	SECTION RAW = Silicon/Qualcomm/sm8150/AcpiTables/BuiltIn/DBG2.aml
+	SECTION RAW = Silicon/Qualcomm/sm8150/AcpiTables/BuiltIn/FACP.aml
+# 	SECTION RAW = Silicon/Qualcomm/sm8150/AcpiTables/BuiltIn/FPDT.aml
+	SECTION RAW = Silicon/Qualcomm/sm8150/AcpiTables/BuiltIn/GTDT.aml
+	SECTION RAW = Silicon/Qualcomm/sm8150/AcpiTables/BuiltIn/IORT.aml
+	SECTION RAW = Silicon/Qualcomm/sm8150/AcpiTables/BuiltIn/MCFG.aml
+# 	SECTION RAW = Silicon/Qualcomm/sm8150/AcpiTables/BuiltIn/MSDM.aml
+	SECTION RAW = Silicon/Qualcomm/sm8150/AcpiTables/BuiltIn/PPTT.aml
+	SECTION RAW = Silicon/Qualcomm/sm8150/AcpiTables/BuiltIn/TPM2.aml
+# 	SECTION RAW = Silicon/Qualcomm/sm8150/AcpiTables/BuiltIn/XSDT.aml
+	SECTION UI = "AcpiTables"
+}
+
+// Mainline device tree blob
+
+
+  #
+  # Touchscreen
+  #
+  # INF Silicon/Qualcomm/QcomPkg/Drivers/SynapticsTCMDxe/SynapticsTCMDevice.inf
+  # INF Silicon/Qualcomm/QcomPkg/Drivers/SynapticsTCMDxe/SynapticsTCMDxe.inf

Platform/LG/sm8150/mh2lm5g.dsc

@@ -0,0 +1,39 @@
+[Defines]
+  VENDOR_NAME                    = LG
+  PLATFORM_NAME                  = mh2lm5g
+  PLATFORM_GUID                  = 28f1a3bf-193a-47e3-a7b9-5a435eaab2ee
+  PLATFORM_VERSION               = 0.1
+  DSC_SPECIFICATION              = 0x00010019
+  OUTPUT_DIRECTORY               = Build/$(PLATFORM_NAME)
+  SUPPORTED_ARCHITECTURES        = AARCH64
+  BUILD_TARGETS                  = DEBUG|RELEASE
+  SKUID_IDENTIFIER               = DEFAULT
+  FLASH_DEFINITION               = Platform/Qualcomm/sm8150/sm8150.fdf
+  DEVICE_DXE_FV_COMPONENTS       = Platform/LG/sm8150/mh2lm5g.fdf.inc
+
+!include Platform/Qualcomm/sm8150/sm8150.dsc
+
+[BuildOptions.common]
+  GCC:*_*_AARCH64_CC_FLAGS = -DPLST_FIX -DMEMMAP_LG_HACKS -DHAS_MLVM
+
+[PcdsFixedAtBuild.common]
+  gQcomTokenSpaceGuid.PcdMipiFrameBufferWidth|1080
+  gQcomTokenSpaceGuid.PcdMipiFrameBufferHeight|2340
+  gQcomTokenSpaceGuid.PcdMipiFrameBufferAddress|0x9C000000
+
+  # Simple Init
+  gSimpleInitTokenSpaceGuid.PcdGuiDefaultDPI|355
+
+  gRenegadePkgTokenSpaceGuid.PcdDeviceVendor|"LG"
+  gRenegadePkgTokenSpaceGuid.PcdDeviceProduct|"V50s ThinQ"
+  gRenegadePkgTokenSpaceGuid.PcdDeviceCodeName|"mh2lm5G"
+
+  # Synaptics Touchscren
+  gQcomTokenSpaceGuid.PcdTouchCtlrAddress|0x20
+  gQcomTokenSpaceGuid.PcdTouchCtlrResetPin|54
+  gQcomTokenSpaceGuid.PcdTouchCtlrIntPin|122
+  gQcomTokenSpaceGuid.PcdTouchCtlrI2cDevice|18
+  gQcomTokenSpaceGuid.PcdTouchMaxX|1080
+  gQcomTokenSpaceGuid.PcdTouchMaxY|2340
+  gQcomTokenSpaceGuid.PcdTouchCtlrVddPin|59
+  gQcomTokenSpaceGuid.PcdTouchCtlrVddIoPin|152

Platform/LG/sm8150/mh2lm5g.fdf.inc

@@ -0,0 +1,57 @@
+// 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/mh2lm5g/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/mh2lm5g/ButtonsDxe/ButtonsDxe.efi
+    SECTION UI = "ButtonsDxe"
+}
+
+FILE DRIVER = f10f76db-42c1-533f-34a8-69be24653110 {
+    SECTION DXE_DEPEX = Platform/EFI_Binaries/Drivers/sm8150/SdccDxe/SdccDxe.depex
+    SECTION PE32 = Platform/EFI_Binaries/Drivers/sm8150/SdccDxe/SdccDxe.efi
+    SECTION UI = "SdccDxe"
+  }
+
+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/sm8150/WP_Binaries/UsbPwrCtrlDxe/UsbPwrCtrlDxe.efi
+    SECTION UI = "UsbPwrCtrlDxe"
+}
+
+// ACPI Tables
+FILE FREEFORM = 7E374E25-8E01-4FEE-87F2-390C23C606CD {
+
+# 	Customized DSDT
+    SECTION RAW = Platform/LG/sm8150/AcpiTables/mh2lm5g/DSDT.aml
+# 	Common Tables
+	SECTION RAW = Silicon/Qualcomm/sm8150/AcpiTables/BuiltIn/APIC.aml
+# 	SECTION RAW = Silicon/Qualcomm/sm8150/AcpiTables/BuiltIn/BERT.aml
+# 	SECTION RAW = Silicon/Qualcomm/sm8150/AcpiTables/BuiltIn/BGRT.aml
+	SECTION RAW = Silicon/Qualcomm/sm8150/AcpiTables/BuiltIn/CSRT.aml
+	SECTION RAW = Silicon/Qualcomm/sm8150/AcpiTables/BuiltIn/DBG2.aml
+	SECTION RAW = Silicon/Qualcomm/sm8150/AcpiTables/BuiltIn/FACP.aml
+# 	SECTION RAW = Silicon/Qualcomm/sm8150/AcpiTables/BuiltIn/FPDT.aml
+	SECTION RAW = Silicon/Qualcomm/sm8150/AcpiTables/BuiltIn/GTDT.aml
+	SECTION RAW = Silicon/Qualcomm/sm8150/AcpiTables/BuiltIn/IORT.aml
+	SECTION RAW = Silicon/Qualcomm/sm8150/AcpiTables/BuiltIn/MCFG.aml
+# 	SECTION RAW = Silicon/Qualcomm/sm8150/AcpiTables/BuiltIn/MSDM.aml
+	SECTION RAW = Silicon/Qualcomm/sm8150/AcpiTables/BuiltIn/PPTT.aml
+	SECTION RAW = Silicon/Qualcomm/sm8150/AcpiTables/BuiltIn/TPM2.aml
+# 	SECTION RAW = Silicon/Qualcomm/sm8150/AcpiTables/BuiltIn/XSDT.aml
+	SECTION UI = "AcpiTables"
+}
+
+// Mainline device tree blob
+
+
+  #
+  # Touchscreen
+  #
+  # INF Silicon/Qualcomm/QcomPkg/Drivers/SynapticsTCMDxe/SynapticsTCMDevice.inf
+  # INF Silicon/Qualcomm/QcomPkg/Drivers/SynapticsTCMDxe/SynapticsTCMDxe.inf

Platform/Lenovo/sm8250/AcpiTables/tb-9707f/Dsdt.asl

@@ -0,0 +1,24 @@
+//
+// NOTE: The 3rd parameter (i.e. ComplianceRevision) must be >=2 for 64-bit integer support.
+//
+DefinitionBlock("DSDT.AML", "DSDT", 0x02, "QCOMM ", "SDM850 ", 3)
+{
+    Scope(\_SB_) {
+
+		// Include("addSub.asl")
+        Include("dsdt_common.asl")
+		// Include("cust_dsdt.asl") 
+
+        // Include("usb.asl")
+
+		//
+        // Buttons
+		//
+        // Include("cust_arraybutton.asl")
+
+        //
+        // Bluetooth
+        //
+        // Include("wcnss_bt.asl")
+   }
+}