Merge pull request #389 from AKAsaliza/master

rebuild for LG mh2lm5G
edk2-porting · May 4, 2024 · 849c615 · 849c615
2 parents 7352c1a + 6169bae
commit 849c615
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/Platform/LG/sm8150/AcpiTables/mh2lm5g/DSDT.aml b/Platform/LG/sm8150/AcpiTables/mh2lm5g/DSDT.aml
diff --git a/Platform/LG/sm8150/mh2lm5g.dsc b/Platform/LG/sm8150/mh2lm5g.dsc
@@ -9,17 +9,17 @@
   BUILD_TARGETS                  = DEBUG|RELEASE
   SKUID_IDENTIFIER               = DEFAULT
   FLASH_DEFINITION               = Platform/Qualcomm/sm8150/sm8150.fdf
-  DEVICE_DXE_FV_COMPONENTS       = Platform/LG/sm8150/mh2lm.fdf.inc
+  DEVICE_DXE_FV_COMPONENTS       = Platform/LG/sm8150/mh2lm5g.fdf.inc
 
 !include Platform/Qualcomm/sm8150/sm8150.dsc
 
 [BuildOptions.common]
-  GCC:*_*_AARCH64_CC_FLAGS = -DENABLE_SIMPLE_INIT -DMEMMAP_LG_HACKS
+  GCC:*_*_AARCH64_CC_FLAGS = -DPLST_FIX -DMEMMAP_LG_HACKS -DHAS_MLVM
 
 [PcdsFixedAtBuild.common]
   gQcomTokenSpaceGuid.PcdMipiFrameBufferWidth|1080
   gQcomTokenSpaceGuid.PcdMipiFrameBufferHeight|2340
-  gQcomTokenSpaceGuid.PcdMipiFrameBufferAddress|0x9D200000
+  gQcomTokenSpaceGuid.PcdMipiFrameBufferAddress|0x9C000000
 
   # Simple Init
   gSimpleInitTokenSpaceGuid.PcdGuiDefaultDPI|355

diff --git a/Platform/LG/sm8150/mh2lm5g.fdf.inc b/Platform/LG/sm8150/mh2lm5g.fdf.inc
@@ -2,13 +2,13 @@
 
 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 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/mh2lm/ButtonsDxe/ButtonsDxe.efi
+    SECTION PE32 = Platform/EFI_Binaries/Drivers/Devices/mh2lm5g/ButtonsDxe/ButtonsDxe.efi
     SECTION UI = "ButtonsDxe"
 }
 
@@ -28,7 +28,7 @@ FILE DRIVER = 11faed4c-b21f-4d88-8e48-c4c28a1e50df {
 FILE FREEFORM = 7E374E25-8E01-4FEE-87F2-390C23C606CD {
 
 # 	Customized DSDT
-    SECTION RAW = Platform/LG/sm8150/AcpiTables/mh2lm/DSDT.aml
+    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

diff --git a/Silicon/Qualcomm/sm8150/Library/MsPlatformDevicesLib/MsPlatformDevicesLib.c b/Silicon/Qualcomm/sm8150/Library/MsPlatformDevicesLib/MsPlatformDevicesLib.c
@@ -165,7 +165,10 @@ PlatformUpdateAcpiTables(VOID)
   UpdateNameAslCode(SIGNATURE_32('S', 'U', 'S', '3'), &SUS3, 4);
   UpdateNameAslCode(SIGNATURE_32('S', 'I', 'D', 'T'), &SIDT, 4);
   UpdateNameAslCode(SIGNATURE_32('S', 'O', 'S', 'N'), &SOSN, 8);
+#ifdef PLST_FIX
+  #else
   UpdateNameAslCode(SIGNATURE_32('P', 'L', 'S', 'T'), &PLST, 4);
+#endif  
   UpdateNameAslCode(SIGNATURE_32('R', 'M', 'T', 'B'), &RMTB, 4);
   UpdateNameAslCode(SIGNATURE_32('R', 'M', 'T', 'X'), &RMTX, 4);
   UpdateNameAslCode(SIGNATURE_32('R', 'F', 'M', 'B'), &RFMB, 4);