From cc698a4dac9e9e7e771d00adf4678e44f4c3cf25 Mon Sep 17 00:00:00 2001 From: Mark Date: Sun, 14 Nov 2021 16:55:19 +1000 Subject: [PATCH] add J5 2016 LTE (EUR), fix build with new edk2 revision --- MSM8916Pkg/CommonDsc.dsc.inc | 14 +++++++------- MSM8916Pkg/MSM8916Pkg.dec | 1 + MSM8916Pkg/MSM8916Pkg.dsc | 16 ++++++++++++---- build_j5xlte.sh | 8 ++++++++ device_specific/j5xlte.dtb | Bin 0 -> 390 bytes device_specific/reference.dts | 6 +++--- 6 files changed, 31 insertions(+), 14 deletions(-) create mode 100755 build_j5xlte.sh create mode 100644 device_specific/j5xlte.dtb diff --git a/MSM8916Pkg/CommonDsc.dsc.inc b/MSM8916Pkg/CommonDsc.dsc.inc index e474e06..45b0312 100644 --- a/MSM8916Pkg/CommonDsc.dsc.inc +++ b/MSM8916Pkg/CommonDsc.dsc.inc @@ -98,7 +98,7 @@ VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf ExtractGuidedSectionLib|MdePkg/Library/DxeExtractGuidedSectionLib/DxeExtractGuidedSectionLib.inf - LzmaDecompressLib|IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf + LzmaDecompressLib|MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf NonDiscoverableDeviceRegistrationLib|MdeModulePkg/Library/NonDiscoverableDeviceRegistrationLib/NonDiscoverableDeviceRegistrationLib.inf @@ -170,21 +170,21 @@ HobLib|MdePkg/Library/DxeCoreHobLib/DxeCoreHobLib.inf MemoryAllocationLib|MdeModulePkg/Library/DxeCoreMemoryAllocationLib/DxeCoreMemoryAllocationLib.inf DxeCoreEntryPoint|MdePkg/Library/DxeCoreEntryPoint/DxeCoreEntryPoint.inf - ReportStatusCodeLib|IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/DxeReportStatusCodeLib.inf + ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf ExtractGuidedSectionLib|MdePkg/Library/DxeExtractGuidedSectionLib/DxeExtractGuidedSectionLib.inf UefiDecompressLib|MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.inf DxeServicesLib|MdePkg/Library/DxeServicesLib/DxeServicesLib.inf PerformanceLib|MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLib.inf [LibraryClasses.common.DXE_DRIVER] - ReportStatusCodeLib|IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/DxeReportStatusCodeLib.inf + ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf DxeServicesLib|MdePkg/Library/DxeServicesLib/DxeServicesLib.inf SecurityManagementLib|MdeModulePkg/Library/DxeSecurityManagementLib/DxeSecurityManagementLib.inf PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf [LibraryClasses.common.UEFI_APPLICATION] - UefiDecompressLib|IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.inf + UefiDecompressLib|MdePkg/Library/BaseUefiDecompressLib/BaseUefiTianoCustomDecompressLib.inf PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf HiiLib|MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf @@ -195,8 +195,8 @@ UefiBootManagerLib|MdeModulePkg/Library/UefiBootManagerLib/UefiBootManagerLib.inf [LibraryClasses.common.UEFI_DRIVER] - ReportStatusCodeLib|IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/DxeReportStatusCodeLib.inf - UefiDecompressLib|IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.inf + ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf + UefiDecompressLib|MdePkg/Library/BaseUefiDecompressLib/BaseUefiTianoCustomDecompressLib.inf ExtractGuidedSectionLib|MdePkg/Library/DxeExtractGuidedSectionLib/DxeExtractGuidedSectionLib.inf PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf DxeServicesLib|MdePkg/Library/DxeServicesLib/DxeServicesLib.inf @@ -208,7 +208,7 @@ ReportStatusCodeLib|MdeModulePkg/Library/RuntimeDxeReportStatusCodeLib/RuntimeDxeReportStatusCodeLib.inf CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibFmp/DxeRuntimeCapsuleLib.inf !ifndef CONFIG_NO_DEBUGLIB - DebugLib|IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf + DebugLib|MdeModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf !endif !if $(TARGET) != RELEASE DebugLib|MdePkg/Library/DxeRuntimeDebugLibSerialPort/DxeRuntimeDebugLibSerialPort.inf diff --git a/MSM8916Pkg/MSM8916Pkg.dec b/MSM8916Pkg/MSM8916Pkg.dec index 09cd2d4..43d2d44 100644 --- a/MSM8916Pkg/MSM8916Pkg.dec +++ b/MSM8916Pkg/MSM8916Pkg.dec @@ -38,6 +38,7 @@ [PcdsFixedAtBuild.common] # Simple FrameBuffer + gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvModeEnable|TRUE|BOOLEAN|1 gMSM8916PkgTokenSpaceGuid.PcdMipiFrameBufferAddress|0x00400000|UINT32|0x0000a400 # 0x7C400000 gMSM8916PkgTokenSpaceGuid.PcdMipiFrameBufferWidth|1080|UINT32|0x0000a401 gMSM8916PkgTokenSpaceGuid.PcdMipiFrameBufferHeight|1920|UINT32|0x0000a402 diff --git a/MSM8916Pkg/MSM8916Pkg.dsc b/MSM8916Pkg/MSM8916Pkg.dsc index a95901b..09f3883 100644 --- a/MSM8916Pkg/MSM8916Pkg.dsc +++ b/MSM8916Pkg/MSM8916Pkg.dsc @@ -28,7 +28,15 @@ !include MSM8916Pkg/CommonDsc.dsc.inc +[LibraryClasses] + RegisterFilterLib|MdePkg/Library/RegisterFilterLibNull/RegisterFilterLibNull.inf + VariablePolicyHelperLib|MdeModulePkg/Library/VariablePolicyHelperLib/VariablePolicyHelperLib.inf + +[LibraryClasses.common.DXE_RUNTIME_DRIVER] + VariablePolicyLib|MdeModulePkg/Library/VariablePolicyLib/VariablePolicyLibRuntimeDxe.inf + [LibraryClasses.common] + OrderedCollectionLib|MdePkg/Library/BaseOrderedCollectionRedBlackTreeLib/BaseOrderedCollectionRedBlackTreeLib.inf ArmLib|ArmPkg/Library/ArmLib/ArmBaseLib.inf ArmPlatformLib|MSM8916Pkg/Library/MSM8916PkgLib/MSM8916PkgLib.inf CompilerIntrinsicsLib|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf @@ -53,10 +61,10 @@ # Network Libraries UefiScsiLib|MdePkg/Library/UefiScsiLib/UefiScsiLib.inf - NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf - DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf - IpIoLib|MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf - UdpIoLib|MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf + NetLib|NetworkPkg/Library/DxeNetLib/DxeNetLib.inf + DpcLib|NetworkPkg/Library/DxeDpcLib/DxeDpcLib.inf + IpIoLib|NetworkPkg/Library/DxeIpIoLib/DxeIpIoLib.inf + UdpIoLib|NetworkPkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf # VariableRuntimeDxe Requirements SynchronizationLib|MdePkg/Library/BaseSynchronizationLib/BaseSynchronizationLib.inf diff --git a/build_j5xlte.sh b/build_j5xlte.sh new file mode 100755 index 0000000..8e33c43 --- /dev/null +++ b/build_j5xlte.sh @@ -0,0 +1,8 @@ +#!/bin/bash +# based on the instructions from edk2-platform +set -e +. build_common.sh +# not actually GCC5; it's GCC7 on Ubuntu 18.04. +GCC5_AARCH64_PREFIX=aarch64-linux-gnu- build -s -n 0 -a AARCH64 -t GCC5 -p MSM8916Pkg/Devices/j5lte.dsc +gzip -c < workspace/Build/MSM8916Pkg/DEBUG_GCC5/FV/MSM8916PKG_UEFI.fd >uefi.img +cat device_specific/j5xlte.dtb >>uefi.img diff --git a/device_specific/j5xlte.dtb b/device_specific/j5xlte.dtb new file mode 100644 index 0000000000000000000000000000000000000000..9e81edc16265f007da13b96447125eac5d928033 GIT binary patch literal 390 zcmcb>`|m9S17jNl1A_&SHUQEZKr9Hv0zeD`VLiYfLlfgU$MGMe zjs=K8>coLqDmXE>xHKFHX$^@*whzxv9DNMU@U9|A7F=E$l$-1`!7d zfyF?64g&K~36LEi%n5UeZe|L^RZ01YMJXU&ZhlH?4g=7k1&Jk@Nja$u%84l{MXANb iy2+_IImHah#hF#9P; // qcom,msm-id = <247 0>; for APQ8016 - qcom,board-id = <0xCE08FF01 5>; /* FIXME: Check your downstream device tree */ + qcom,board-id = <0xCE08FF01 4>; /* FIXME: Check your downstream device tree */ - model = "Samsung Galaxy J5 2015"; // FIXME - compatible = "samsung,j500f", "qcom,msm8916"; // FIXME + model = "Samsung Galaxy J5 2016"; // FIXME + compatible = "samsung,j510f", "qcom,msm8916"; // FIXME #address-cells = <2>; #size-cells = <2>;