From be239a7c4124fc3d997c140b997b7709adb171e2 Mon Sep 17 00:00:00 2001
From: AKAsaliza <33549290+AKAsaliza@users.noreply.github.com>
Date: Sat, 27 Aug 2022 13:57:29 +0900
Subject: [PATCH] Fix LG pil address

---
 sdm845Pkg/Devices/judyln.dsc                      |  2 +-
 sdm845Pkg/Devices/judyp.dsc                       |  2 +-
 sdm845Pkg/Devices/judypn.dsc                      |  2 +-
 sdm845Pkg/Include/Configuration/DeviceMemoryMap.h | 15 ++++++++++++++-
 4 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/sdm845Pkg/Devices/judyln.dsc b/sdm845Pkg/Devices/judyln.dsc
index 6d360a0..e8e6202 100644
--- a/sdm845Pkg/Devices/judyln.dsc
+++ b/sdm845Pkg/Devices/judyln.dsc
@@ -15,7 +15,7 @@
 !include sdm845Pkg/sdm845Pkg.dsc
 
 [BuildOptions.common]
-  GCC:*_*_AARCH64_CC_FLAGS = -DAB_SLOTS_SUPPORT=1 -DENABLE_SIMPLE_INIT -DENABLE_LINUX_SIMPLE_MASS_STORAGE
+  GCC:*_*_AARCH64_CC_FLAGS = -DLG_PIL_FIXED=1 -DAB_SLOTS_SUPPORT=1 -DENABLE_SIMPLE_INIT -DENABLE_LINUX_SIMPLE_MASS_STORAGE
 
 [PcdsFixedAtBuild.common]
 
diff --git a/sdm845Pkg/Devices/judyp.dsc b/sdm845Pkg/Devices/judyp.dsc
index 753fbce..32ebca8 100644
--- a/sdm845Pkg/Devices/judyp.dsc
+++ b/sdm845Pkg/Devices/judyp.dsc
@@ -15,7 +15,7 @@
 !include sdm845Pkg/sdm845Pkg.dsc
 
 [BuildOptions.common]
-  GCC:*_*_AARCH64_CC_FLAGS = -DAB_SLOTS_SUPPORT=1 -DENABLE_SIMPLE_INIT -DENABLE_LINUX_SIMPLE_MASS_STORAGE
+  GCC:*_*_AARCH64_CC_FLAGS = -DLG_PIL_FIXED=1 -DAB_SLOTS_SUPPORT=1 -DENABLE_SIMPLE_INIT -DENABLE_LINUX_SIMPLE_MASS_STORAGE
 
 [PcdsFixedAtBuild.common]
 
diff --git a/sdm845Pkg/Devices/judypn.dsc b/sdm845Pkg/Devices/judypn.dsc
index 5a6c110..6d20f0e 100644
--- a/sdm845Pkg/Devices/judypn.dsc
+++ b/sdm845Pkg/Devices/judypn.dsc
@@ -15,7 +15,7 @@
 !include sdm845Pkg/sdm845Pkg.dsc
 
 [BuildOptions.common]
-  GCC:*_*_AARCH64_CC_FLAGS = -DAB_SLOTS_SUPPORT=1 -DENABLE_SIMPLE_INIT -DENABLE_LINUX_SIMPLE_MASS_STORAGE
+  GCC:*_*_AARCH64_CC_FLAGS = -DLG_PIL_FIXED=1 -DAB_SLOTS_SUPPORT=1 -DENABLE_SIMPLE_INIT -DENABLE_LINUX_SIMPLE_MASS_STORAGE
 
 [PcdsFixedAtBuild.common]
 
diff --git a/sdm845Pkg/Include/Configuration/DeviceMemoryMap.h b/sdm845Pkg/Include/Configuration/DeviceMemoryMap.h
index fbc1ca4..b6df7f1 100644
--- a/sdm845Pkg/Include/Configuration/DeviceMemoryMap.h
+++ b/sdm845Pkg/Include/Configuration/DeviceMemoryMap.h
@@ -69,6 +69,17 @@ static ARM_MEMORY_REGION_DESCRIPTOR_EX gDeviceMemoryDescriptorEx[] = {
     {0x8B500000, 0x00A00000, EFI_RESOURCE_SYSTEM_MEMORY,
      SYSTEM_MEMORY_RESOURCE_ATTR_CAPABILITIES,
      ARM_MEMORY_REGION_ATTRIBUTE_DEVICE, AddMem, EfiReservedMemoryType},
+
+#ifdef LG_PIL_FIXED
+    /* PIL_REGION */
+    {0x8BF00000, 0x0D200000, EFI_RESOURCE_SYSTEM_MEMORY,
+     SYSTEM_MEMORY_RESOURCE_ATTR_CAPABILITIES,
+     ARM_MEMORY_REGION_ATTRIBUTE_DEVICE, AddMem, EfiReservedMemoryType},
+    /* DXE Heap */
+    {0x99100000, 0x04230000, EFI_RESOURCE_SYSTEM_MEMORY,
+     SYSTEM_MEMORY_RESOURCE_ATTR_CAPABILITIES,
+     ARM_MEMORY_REGION_ATTRIBUTE_WRITE_BACK, AddMem, EfiConventionalMemory},
+#else
 #ifdef XIAOMI_PIL_FIXED
     /* PIL_REGION */
     {0x8BF00000, 0x0C100000, EFI_RESOURCE_SYSTEM_MEMORY,
@@ -88,7 +99,9 @@ static ARM_MEMORY_REGION_DESCRIPTOR_EX gDeviceMemoryDescriptorEx[] = {
      SYSTEM_MEMORY_RESOURCE_ATTR_CAPABILITIES,
      ARM_MEMORY_REGION_ATTRIBUTE_WRITE_BACK, AddMem, EfiConventionalMemory},
 #endif
-    /* DBI Dump */
+#endif
+    
+	/* DBI Dump */
     {0x9D330000, 0x000D0000, EFI_RESOURCE_MEMORY_MAPPED_IO,
      EFI_RESOURCE_ATTRIBUTE_INITIALIZED, ARM_MEMORY_REGION_ATTRIBUTE_DEVICE,
      NoHob, EfiConventionalMemory},
-- 
2.45.2