From: Freak2112 <64154433+mhtygt211227@users.noreply.github.com> Date: 星期三, 25 Aug 2021 14:19:24 +0000 (+0300) Subject: lets use most ram and update memory map X-Git-Tag: v1.0.3~8 X-Git-Url: https://git.renegade-project.org/?a=commitdiff_plain;h=eab3055d8accf5ca930fac5e73868360b2bd65e7;p=edk2-sdm845.git lets use most ram and update memory map --- diff --git a/sdm845Pkg/Devices/beryllium.dsc b/sdm845Pkg/Devices/beryllium.dsc index a3c0c76..7d71522 100644 --- 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 0f34811..33fada8 100644 --- 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 new mode 100644 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 10e0e8d..c609bfe 100644 --- 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 f20e52d..3ccda08 100644 --- 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 986fa1a..d55bcd4 100644 --- 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 18ba6b2..4270845 100644 --- 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 new mode 100644 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 1cf6a9d..c7b3e33 100644 --- 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 15bf21a..93a4c8f 100644 --- 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 633545d..ccd3f0c 100644 --- 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 53782c2..4904d58 100644 --- 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 6facc36..ac00694 100644 --- 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 18ba6b2..4270845 100644 --- 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 7fbe152..4b424f9 100644 --- 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 9ed76bd..7810b45 100644 --- 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, EfiReservedMemoryType}, /* TZApps */ - {0x86D00000, 0x03E00000, EFI_RESOURCE_SYSTEM_MEMORY, + {0x86D00000, 0x00E00000, EFI_RESOURCE_SYSTEM_MEMORY, SYSTEM_MEMORY_RESOURCE_ATTR_CAPABILITIES, ARM_MEMORY_REGION_ATTRIBUTE_DEVICE, NoHob, EfiReservedMemoryType}, /* TGCM */ - {0x8AB00000, 0x01400000, EFI_RESOURCE_SYSTEM_MEMORY, + {0x8B500000, 0x00A00000, EFI_RESOURCE_SYSTEM_MEMORY, SYSTEM_MEMORY_RESOURCE_ATTR_CAPABILITIES, ARM_MEMORY_REGION_ATTRIBUTE_DEVICE, AddMem, EfiReservedMemoryType}, #ifdef XIAOMI_PIL_FIXED @@ -172,15 +172,10 @@ static ARM_MEMORY_REGION_DESCRIPTOR_EX gDeviceMemoryDescriptorEx[] = { SYSTEM_MEMORY_RESOURCE_ATTR_CAPABILITIES, ARM_MEMORY_REGION_ATTRIBUTE_WRITE_BACK, AddMem, EfiConventionalMemory}, #else - {0xA0000000, 0xE0000000, EFI_RESOURCE_SYSTEM_MEMORY, - SYSTEM_MEMORY_RESOURCE_ATTR_CAPABILITIES, - ARM_MEMORY_REGION_ATTRIBUTE_WRITE_BACK, AddMem, EfiConventionalMemory}, - {0x180000000, 0x57400000, EFI_RESOURCE_SYSTEM_MEMORY, - SYSTEM_MEMORY_RESOURCE_ATTR_CAPABILITIES, - ARM_MEMORY_REGION_ATTRIBUTE_WRITE_BACK, AddMem, EfiConventionalMemory}, - {0x1D7400000, 0x8000000, EFI_RESOURCE_SYSTEM_MEMORY, + {0xA0000000, 0x15AE00000, EFI_RESOURCE_SYSTEM_MEMORY, SYSTEM_MEMORY_RESOURCE_ATTR_CAPABILITIES, ARM_MEMORY_REGION_ATTRIBUTE_WRITE_BACK, AddMem, EfiConventionalMemory}, + #endif #endif