Add support for Oneplus 6T 10GB RAM version

Signed-off-by: Xilin Wu <strongtz@yeah.net>

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index c452790fd969326a5bdf01886331d4fc42653fd7..b200fb209517f69d3af23f7b1ab312defa8da042 100644 (file)
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -27,6 +27,7 @@ jobs:
           - enchilada-8g
           - fajita
           - fajita-8g
+          - fajita-10g
           - polaris
           - polaris-8g
           - beryllium

diff --git a/build.sh b/build.sh
index a9b6970f3d018b449c429e618671e22321bf4708..b971e98c1de828d06e4b3a01828318bbb6cc7202 100755 (executable)
--- a/build.sh
+++ b/build.sh
@@ -7,6 +7,7 @@ DEVICES=(
        enchilada-8g
        fajita
        fajita-8g
+       fajita-10g
        polaris
        polaris-8g
        beryllium

diff --git a/device_specific/fajita-10g.dtb b/device_specific/fajita-10g.dtb
new file mode 100644 (file)
index 0000000..6e262ae
Binary files /dev/null and b/device_specific/fajita-10g.dtb differ

diff --git a/sdm845Pkg/Devices/fajita-10g.dsc b/sdm845Pkg/Devices/fajita-10g.dsc
new file mode 100644 (file)
index 0000000..650db01
--- /dev/null
+++ b/sdm845Pkg/Devices/fajita-10g.dsc
@@ -0,0 +1,29 @@
+[Defines]
+  PLATFORM_NAME                  = sdm845Pkg
+  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               = sdm845Pkg/Devices/fajita.fdf
+
+  # Enable A/B Slot Environment
+  DEFINE AB_SLOTS_SUPPORT        = TRUE
+
+!include sdm845Pkg/sdm845Pkg.dsc
+
+[BuildOptions.common]
+  GCC:*_*_AARCH64_CC_FLAGS = -DMEMORY_10G=1 -DAB_SLOTS_SUPPORT=1 -DDISPLAY_DPI=440 -DENABLE_SIMPLE_INIT
+
+[PcdsFixedAtBuild.common]
+  # System Memory (10GB)
+  gArmTokenSpaceGuid.PcdSystemMemorySize|0x260000000
+
+  gsdm845PkgTokenSpaceGuid.PcdMipiFrameBufferWidth|1080
+  gsdm845PkgTokenSpaceGuid.PcdMipiFrameBufferHeight|2340
+
+  gsdm845PkgTokenSpaceGuid.PcdDeviceVendor|"Oneplus"
+  gsdm845PkgTokenSpaceGuid.PcdDeviceProduct|"6T"
+  gsdm845PkgTokenSpaceGuid.PcdDeviceCodeName|"fajita"

diff --git a/sdm845Pkg/Include/Configuration/DeviceMemoryMap.h b/sdm845Pkg/Include/Configuration/DeviceMemoryMap.h
index b1276ae53915a18ed08d6ec944f2685763c1a164..dfa683aa27439c8304d91a9b2f90f24584b97140 100644 (file)
--- a/sdm845Pkg/Include/Configuration/DeviceMemoryMap.h
+++ b/sdm845Pkg/Include/Configuration/DeviceMemoryMap.h
@@ -170,11 +170,17 @@ static ARM_MEMORY_REGION_DESCRIPTOR_EX gDeviceMemoryDescriptorEx[] = {
     {0x180000000, 0xFC8A0000, EFI_RESOURCE_SYSTEM_MEMORY,\r
      SYSTEM_MEMORY_RESOURCE_ATTR_CAPABILITIES,\r
      ARM_MEMORY_REGION_ATTRIBUTE_WRITE_BACK, AddMem, EfiConventionalMemory},\r
+#else\r
+#ifdef MEMORY_10G\r
+    {0xA0000000, 0x254AC0000, EFI_RESOURCE_SYSTEM_MEMORY,\r
+    SYSTEM_MEMORY_RESOURCE_ATTR_CAPABILITIES,\r
+    ARM_MEMORY_REGION_ATTRIBUTE_WRITE_BACK, AddMem, EfiConventionalMemory},\r
 #else\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
 #endif\r
 \r