lets use most ram and update memory map

diff --git a/sdm845Pkg/Devices/beryllium.dsc b/sdm845Pkg/Devices/beryllium.dsc
index a3c0c763a49285151e982410a4c0edeae92213c1..7d7152218e4af5b7f0fb305c200229a40c50410d 100644 (file)
--- a/sdm845Pkg/Devices/beryllium.dsc
+++ b/sdm845Pkg/Devices/beryllium.dsc
@@ -13,7 +13,7 @@
 
 [PcdsFixedAtBuild.common]
   # System Memory (5GB)
-  gArmTokenSpaceGuid.PcdSystemMemorySize|0x140000000
+  gArmTokenSpaceGuid.PcdSystemMemorySize|0x15AE00000
 
   #gsdm845PkgTokenSpaceGuid.PcdMipiFrameBufferAddress|0x9D469780
   gsdm845PkgTokenSpaceGuid.PcdMipiFrameBufferWidth|1080

diff --git a/sdm845Pkg/Devices/dipper.dsc b/sdm845Pkg/Devices/dipper.dsc
index 0f34811da2c704bcf9361657854525121ce8c534..33fada8742de1d150c4b7f9853154a8031262746 100644 (file)
--- a/sdm845Pkg/Devices/dipper.dsc
+++ b/sdm845Pkg/Devices/dipper.dsc
@@ -16,7 +16,7 @@
 
 [PcdsFixedAtBuild.common]
   # System Memory (5GB)
-  gArmTokenSpaceGuid.PcdSystemMemorySize|0x140000000
+  gArmTokenSpaceGuid.PcdSystemMemorySize|0x15AE00000
 
   gsdm845PkgTokenSpaceGuid.PcdMipiFrameBufferWidth|1080
   gsdm845PkgTokenSpaceGuid.PcdMipiFrameBufferHeight|2248

diff --git a/sdm845Pkg/Devices/draco.dsc b/sdm845Pkg/Devices/draco.dsc
old mode 100755 (executable)
new mode 100644 (file)
index ccc60b7..fa11234
--- a/sdm845Pkg/Devices/draco.dsc
+++ b/sdm845Pkg/Devices/draco.dsc
@@ -13,7 +13,7 @@
 
 [PcdsFixedAtBuild.common]
   # System Memory (5GB)
-  gArmTokenSpaceGuid.PcdSystemMemorySize|0x140000000
+  gArmTokenSpaceGuid.PcdSystemMemorySize|0x15AE00000
 
   gsdm845PkgTokenSpaceGuid.PcdMipiFrameBufferWidth|1080
   gsdm845PkgTokenSpaceGuid.PcdMipiFrameBufferHeight|2246

diff --git a/sdm845Pkg/Devices/enchilada.dsc b/sdm845Pkg/Devices/enchilada.dsc
index 10e0e8dfe1b64c8248a16603d2a995ad87600e30..c609bfeeb7f65b6db3f63c8ee2cc9196f1eb75b0 100644 (file)
--- a/sdm845Pkg/Devices/enchilada.dsc
+++ b/sdm845Pkg/Devices/enchilada.dsc
@@ -12,8 +12,8 @@
 !include sdm845Pkg/sdm845Pkg.dsc
 
 [PcdsFixedAtBuild.common]
-  # System Memory (5GB)
-  gArmTokenSpaceGuid.PcdSystemMemorySize|0x140000000
+  # System Memory (5GB)                    
+  gArmTokenSpaceGuid.PcdSystemMemorySize|0x15AE00000
 
   gsdm845PkgTokenSpaceGuid.PcdMipiFrameBufferWidth|1080
   gsdm845PkgTokenSpaceGuid.PcdMipiFrameBufferHeight|2280

diff --git a/sdm845Pkg/Devices/fajita.dsc b/sdm845Pkg/Devices/fajita.dsc
index f20e52dfa92b7178f43cab9de4aad42ba6da764c..3ccda08f355369572c288d5b2a231606f7faddf3 100644 (file)
--- a/sdm845Pkg/Devices/fajita.dsc
+++ b/sdm845Pkg/Devices/fajita.dsc
@@ -13,7 +13,7 @@
 
 [PcdsFixedAtBuild.common]
   # System Memory (5GB)
-  gArmTokenSpaceGuid.PcdSystemMemorySize|0x140000000
+  gArmTokenSpaceGuid.PcdSystemMemorySize|0x15AE00000
 
   gsdm845PkgTokenSpaceGuid.PcdMipiFrameBufferWidth|1080
   gsdm845PkgTokenSpaceGuid.PcdMipiFrameBufferHeight|2340

diff --git a/sdm845Pkg/Devices/generic.dsc b/sdm845Pkg/Devices/generic.dsc
index 986fa1a872dffbc12804ffc7ab0a5e59ce4ea508..d55bcd41a3ad4119edb396e08468c6e7882e6b1e 100644 (file)
--- a/sdm845Pkg/Devices/generic.dsc
+++ b/sdm845Pkg/Devices/generic.dsc
@@ -13,7 +13,7 @@
 
 [PcdsFixedAtBuild.common]
   # System Memory (5GB)
-  gArmTokenSpaceGuid.PcdSystemMemorySize|0x140000000
+  gArmTokenSpaceGuid.PcdSystemMemorySize|0x15AE00000
 
   gsdm845PkgTokenSpaceGuid.PcdMipiFrameBufferWidth|1080
   gsdm845PkgTokenSpaceGuid.PcdMipiFrameBufferHeight|1920

diff --git a/sdm845Pkg/Devices/m1882.dsc b/sdm845Pkg/Devices/m1882.dsc
index 18ba6b2949c756dc22b92c037cbf262e6266016c..427084526be91c57a99594ed4fd9cc76144aa654 100644 (file)
--- a/sdm845Pkg/Devices/m1882.dsc
+++ b/sdm845Pkg/Devices/m1882.dsc
@@ -13,7 +13,7 @@
 
 [PcdsFixedAtBuild.common]
   # System Memory (5GB)
-  gArmTokenSpaceGuid.PcdSystemMemorySize|0x140000000
+  gArmTokenSpaceGuid.PcdSystemMemorySize|0x15AE00000
 
   gsdm845PkgTokenSpaceGuid.PcdMipiFrameBufferWidth|1080
   gsdm845PkgTokenSpaceGuid.PcdMipiFrameBufferHeight|2160

diff --git a/sdm845Pkg/Devices/m1892.dsc b/sdm845Pkg/Devices/m1892.dsc
old mode 100755 (executable)
new mode 100644 (file)
index 18ba6b2..4270845
--- a/sdm845Pkg/Devices/m1892.dsc
+++ b/sdm845Pkg/Devices/m1892.dsc
@@ -13,7 +13,7 @@
 
 [PcdsFixedAtBuild.common]
   # System Memory (5GB)
-  gArmTokenSpaceGuid.PcdSystemMemorySize|0x140000000
+  gArmTokenSpaceGuid.PcdSystemMemorySize|0x15AE00000
 
   gsdm845PkgTokenSpaceGuid.PcdMipiFrameBufferWidth|1080
   gsdm845PkgTokenSpaceGuid.PcdMipiFrameBufferHeight|2160

diff --git a/sdm845Pkg/Devices/nx616j.dsc b/sdm845Pkg/Devices/nx616j.dsc
index 1cf6a9dc3d55f6dc393d516b937191f40b917dee..c7b3e33c50483da33ec2de592ab8e769a3d635ac 100644 (file)
--- a/sdm845Pkg/Devices/nx616j.dsc
+++ b/sdm845Pkg/Devices/nx616j.dsc
@@ -13,7 +13,7 @@
 
 [PcdsFixedAtBuild.common]
   # System Memory (5GB)
-  gArmTokenSpaceGuid.PcdSystemMemorySize|0x140000000
+  gArmTokenSpaceGuid.PcdSystemMemorySize|0x15AE00000
 
   gsdm845PkgTokenSpaceGuid.PcdMipiFrameBufferWidth|1080
   gsdm845PkgTokenSpaceGuid.PcdMipiFrameBufferHeight|2280

diff --git a/sdm845Pkg/Devices/olympic.dsc b/sdm845Pkg/Devices/olympic.dsc
index 15bf21a624e474d41018325d2bde5bec6505cdc2..93a4c8f4a02557855ced76f18d079b48b808a26d 100644 (file)
--- a/sdm845Pkg/Devices/olympic.dsc
+++ b/sdm845Pkg/Devices/olympic.dsc
@@ -13,7 +13,7 @@
 
 [PcdsFixedAtBuild.common]
   # System Memory (5GB)
-  gArmTokenSpaceGuid.PcdSystemMemorySize|0x140000000
+  gArmTokenSpaceGuid.PcdSystemMemorySize|0x15AE00000
 
   gsdm845PkgTokenSpaceGuid.PcdMipiFrameBufferWidth|1440
   gsdm845PkgTokenSpaceGuid.PcdMipiFrameBufferHeight|2880

diff --git a/sdm845Pkg/Devices/pafm00.dsc b/sdm845Pkg/Devices/pafm00.dsc
index 633545d6bed9825d2a61a55eee21c4ee93b58beb..ccd3f0c22d4245807f1f56bbe33b0a00d49b42c5 100644 (file)
--- a/sdm845Pkg/Devices/pafm00.dsc
+++ b/sdm845Pkg/Devices/pafm00.dsc
@@ -11,9 +11,12 @@
 
 !include sdm845Pkg/sdm845Pkg.dsc
 
+[BuildOptions.common]
+  GCC:*_*_AARCH64_CC_FLAGS = -DMEMORY_8G=1
+
 [PcdsFixedAtBuild.common]
-  # System Memory (5GB)
-  gArmTokenSpaceGuid.PcdSystemMemorySize|0x140000000
+  # System Memory (7GB)
+  gArmTokenSpaceGuid.PcdSystemMemorySize|0x1E0000000
 
   gsdm845PkgTokenSpaceGuid.PcdMipiFrameBufferWidth|1080
   gsdm845PkgTokenSpaceGuid.PcdMipiFrameBufferHeight|2340

diff --git a/sdm845Pkg/Devices/perseus.dsc b/sdm845Pkg/Devices/perseus.dsc
index 53782c2b0fede673449294d11882c83ce032357f..4904d5837bd48049144fc685b24029896c34c85d 100644 (file)
--- a/sdm845Pkg/Devices/perseus.dsc
+++ b/sdm845Pkg/Devices/perseus.dsc
@@ -16,7 +16,7 @@
 
 [PcdsFixedAtBuild.common]
   # System Memory (5GB)
-  gArmTokenSpaceGuid.PcdSystemMemorySize|0x140000000
+  gArmTokenSpaceGuid.PcdSystemMemorySize|0x15AE00000
 
   gsdm845PkgTokenSpaceGuid.PcdMipiFrameBufferWidth|1080
   gsdm845PkgTokenSpaceGuid.PcdMipiFrameBufferHeight|2340

diff --git a/sdm845Pkg/Devices/polaris.dsc b/sdm845Pkg/Devices/polaris.dsc
index 6facc369f75e18f901c587467e9304afc9f70bd2..ac00694583e5af79381bbe8b5805f431dc45235c 100644 (file)
--- a/sdm845Pkg/Devices/polaris.dsc
+++ b/sdm845Pkg/Devices/polaris.dsc
@@ -16,7 +16,7 @@
 
 [PcdsFixedAtBuild.common]
   # System Memory (5GB)
-  gArmTokenSpaceGuid.PcdSystemMemorySize|0x140000000
+  gArmTokenSpaceGuid.PcdSystemMemorySize|0x15AE00000
 
   gsdm845PkgTokenSpaceGuid.PcdMipiFrameBufferWidth|1080
   gsdm845PkgTokenSpaceGuid.PcdMipiFrameBufferHeight|2160

diff --git a/sdm845Pkg/Devices/skr-a0.dsc b/sdm845Pkg/Devices/skr-a0.dsc
index 18ba6b2949c756dc22b92c037cbf262e6266016c..427084526be91c57a99594ed4fd9cc76144aa654 100644 (file)
--- a/sdm845Pkg/Devices/skr-a0.dsc
+++ b/sdm845Pkg/Devices/skr-a0.dsc
@@ -13,7 +13,7 @@
 
 [PcdsFixedAtBuild.common]
   # System Memory (5GB)
-  gArmTokenSpaceGuid.PcdSystemMemorySize|0x140000000
+  gArmTokenSpaceGuid.PcdSystemMemorySize|0x15AE00000
 
   gsdm845PkgTokenSpaceGuid.PcdMipiFrameBufferWidth|1080
   gsdm845PkgTokenSpaceGuid.PcdMipiFrameBufferHeight|2160

diff --git a/sdm845Pkg/Devices/trident.dsc b/sdm845Pkg/Devices/trident.dsc
index 7fbe15212d597898134f476454817c5359ba5e5f..4b424f92670d53f0596f43dabdaeef2320363cf9 100644 (file)
--- a/sdm845Pkg/Devices/trident.dsc
+++ b/sdm845Pkg/Devices/trident.dsc
@@ -13,7 +13,7 @@
 
 [PcdsFixedAtBuild.common]
   # System Memory (5GB)
-  gArmTokenSpaceGuid.PcdSystemMemorySize|0x140000000
+  gArmTokenSpaceGuid.PcdSystemMemorySize|0x15AE00000
 
   gsdm845PkgTokenSpaceGuid.PcdMipiFrameBufferWidth|1080
   gsdm845PkgTokenSpaceGuid.PcdMipiFrameBufferHeight|2242

diff --git a/sdm845Pkg/Include/Configuration/DeviceMemoryMap.h b/sdm845Pkg/Include/Configuration/DeviceMemoryMap.h
index 9ed76bd304203f7b42f1b4d77a30f458d3416b93..7810b45607340c7c889811e923b6187ce257fd3d 100644 (file)
--- a/sdm845Pkg/Include/Configuration/DeviceMemoryMap.h
+++ b/sdm845Pkg/Include/Configuration/DeviceMemoryMap.h
@@ -63,11 +63,11 @@ static ARM_MEMORY_REGION_DESCRIPTOR_EX gDeviceMemoryDescriptorEx[] = {
      ARM_MEMORY_REGION_ATTRIBUTE_UNCACHED_UNBUFFERED, AddMem,\r
      EfiReservedMemoryType},\r
        /* TZApps */\r
-       {0x86D00000, 0x03E00000, EFI_RESOURCE_SYSTEM_MEMORY,\r
+       {0x86D00000, 0x00E00000, EFI_RESOURCE_SYSTEM_MEMORY,\r
      SYSTEM_MEMORY_RESOURCE_ATTR_CAPABILITIES,\r
      ARM_MEMORY_REGION_ATTRIBUTE_DEVICE, NoHob, EfiReservedMemoryType},\r
        /* TGCM */\r
-       {0x8AB00000, 0x01400000, EFI_RESOURCE_SYSTEM_MEMORY,\r
+       {0x8B500000, 0x00A00000, EFI_RESOURCE_SYSTEM_MEMORY,\r
      SYSTEM_MEMORY_RESOURCE_ATTR_CAPABILITIES,\r
      ARM_MEMORY_REGION_ATTRIBUTE_DEVICE, AddMem, EfiReservedMemoryType},\r
 #ifdef XIAOMI_PIL_FIXED\r
@@ -172,15 +172,10 @@ static ARM_MEMORY_REGION_DESCRIPTOR_EX gDeviceMemoryDescriptorEx[] = {
      SYSTEM_MEMORY_RESOURCE_ATTR_CAPABILITIES,\r
      ARM_MEMORY_REGION_ATTRIBUTE_WRITE_BACK, AddMem, EfiConventionalMemory},\r
 #else\r
-       {0xA0000000, 0xE0000000, EFI_RESOURCE_SYSTEM_MEMORY,\r
-     SYSTEM_MEMORY_RESOURCE_ATTR_CAPABILITIES,\r
-     ARM_MEMORY_REGION_ATTRIBUTE_WRITE_BACK, AddMem, EfiConventionalMemory},\r
-       {0x180000000, 0x57400000, EFI_RESOURCE_SYSTEM_MEMORY,\r
-     SYSTEM_MEMORY_RESOURCE_ATTR_CAPABILITIES,\r
-     ARM_MEMORY_REGION_ATTRIBUTE_WRITE_BACK, AddMem, EfiConventionalMemory},\r
-       {0x1D7400000, 0x8000000, EFI_RESOURCE_SYSTEM_MEMORY,\r
+       {0xA0000000, 0x15AE00000, EFI_RESOURCE_SYSTEM_MEMORY,\r
      SYSTEM_MEMORY_RESOURCE_ATTR_CAPABILITIES,\r
      ARM_MEMORY_REGION_ATTRIBUTE_WRITE_BACK, AddMem, EfiConventionalMemory},\r
+\r
 #endif\r
 #endif\r
 \r