From: Teguh Sobirin Date: 星期六, 21 Aug 2021 22:34:19 +0000 (+0700) Subject: Why need separate polaris? XD X-Git-Tag: v1.0.2~3 X-Git-Url: https://git.renegade-project.org/?a=commitdiff_plain;h=a97a085adee5b585c9dc03284730cde7c3de171a;p=edk2-sdm845.git Why need separate polaris? XD --- diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d2e2d6a..074a5c9 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -24,8 +24,7 @@ jobs: - dipper - enchilada - fajita - - polaris-usb - - polaris-gpu + - polaris - beryllium - perseus - nx616j diff --git a/build.sh b/build.sh index 2268fe8..c4e174a 100755 --- a/build.sh +++ b/build.sh @@ -5,8 +5,7 @@ DEVICES=( dipper enchilada fajita - polaris-usb - polaris-gpu + polaris beryllium perseus nx616j diff --git a/device_specific/polaris-usb.dtb b/device_specific/polaris-usb.dtb deleted file mode 100644 index aa10daf..0000000 Binary files a/device_specific/polaris-usb.dtb and /dev/null differ diff --git a/device_specific/polaris-gpu.dtb b/device_specific/polaris.dtb similarity index 100% rename from device_specific/polaris-gpu.dtb rename to device_specific/polaris.dtb diff --git a/sdm845Pkg/Devices/polaris-gpu.fdf b/sdm845Pkg/Devices/polaris-gpu.fdf deleted file mode 100644 index 4c96e93..0000000 --- a/sdm845Pkg/Devices/polaris-gpu.fdf +++ /dev/null @@ -1,316 +0,0 @@ -# -# Copyright (c) 2018, Linaro Limited. All rights reserved. -# -# This program and the accompanying materials -# are licensed and made available under the terms and conditions of the BSD License -# which accompanies this distribution. The full text of the license may be found at -# http://opensource.org/licenses/bsd-license.php -# -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. -# - -################################################################################ -# -# FD Section -# The [FD] Section is made up of the definition statements and a -# description of what goes into the Flash Device Image. Each FD section -# defines one flash "device" image. A flash device image may be one of -# the following: Removable media bootable image (like a boot floppy -# image,) an Option ROM image (that would be "flashed" into an add-in -# card,) a System "Flash" image (that would be burned into a system's -# flash) or an Update ("Capsule") image that will be used to update and -# existing system flash. -# -################################################################################ - -[FD.sdm845Pkg_UEFI] -BaseAddress = 0xd0000000|gArmTokenSpaceGuid.PcdFdBaseAddress # The base address of the Firmware in NOR Flash. -Size = 0x00200000|gArmTokenSpaceGuid.PcdFdSize # The size in bytes of the FLASH Device -ErasePolarity = 1 - -# This one is tricky, it must be: BlockSize * NumBlocks = Size -BlockSize = 0x00001000 -NumBlocks = 0x200 - -################################################################################ -# -# Following are lists of FD Region layout which correspond to the locations of different -# images within the flash device. -# -# Regions must be defined in ascending order and may not overlap. -# -# A Layout Region start with a eight digit hex offset (leading "0x" required) followed by -# the pipe "|" character, followed by the size of the region, also in hex with the leading -# "0x" characters. Like: -# Offset|Size -# PcdOffsetCName|PcdSizeCName -# RegionType -# -################################################################################ - -# from ArmVirtPkg/ArmVirtQemuKernel.fdf -# -# Implement the Linux kernel header layout so that the loader will identify -# it as something bootable, and execute it with a FDT pointer in x0 or r2. -# -0x00000000|0x00008000 -DATA = { - 0x01, 0x00, 0x00, 0x10, # code0: adr x1, . - 0xff, 0x1f, 0x00, 0x14, # code1: b 0x8000 - 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, # text_offset: 512 KB - 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, # image_size: 2 MB - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, # flags - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, # res2 - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, # res3 - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, # res4 - 0x41, 0x52, 0x4d, 0x64, # magic: "ARM\x64" - 0x00, 0x00, 0x00, 0x00 # res5 -} - -0x00008000|0x001f8000 -gArmTokenSpaceGuid.PcdFvBaseAddress|gArmTokenSpaceGuid.PcdFvSize -FV = FVMAIN_COMPACT - - -################################################################################ -# -# FV Section -# -# [FV] section is used to define what components or modules are placed within a flash -# device file. This section also defines order the components and modules are positioned -# within the image. The [FV] section consists of define statements, set statements and -# module statements. -# -################################################################################ - -[FV.FvMain] -BlockSize = 0x40 -NumBlocks = 0 # This FV gets compressed so make it just big enough -FvAlignment = 8 # FV alignment and FV attributes setting. -ERASE_POLARITY = 1 -MEMORY_MAPPED = TRUE -STICKY_WRITE = TRUE -LOCK_CAP = TRUE -LOCK_STATUS = TRUE -WRITE_DISABLED_CAP = TRUE -WRITE_ENABLED_CAP = TRUE -WRITE_STATUS = TRUE -WRITE_LOCK_CAP = TRUE -WRITE_LOCK_STATUS = TRUE -READ_DISABLED_CAP = TRUE -READ_ENABLED_CAP = TRUE -READ_STATUS = TRUE -READ_LOCK_CAP = TRUE -READ_LOCK_STATUS = TRUE - -APRIORI DXE { - - # - # PI DXE Drivers producing Architectural Protocols (EFI Services) - # - INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf - INF MdeModulePkg/Core/Dxe/DxeMain.inf - INF MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxe.inf - INF MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxe.inf - INF MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf - INF ArmPkg/Drivers/CpuDxe/CpuDxe.inf - INF ArmPkg/Drivers/ArmGic/ArmGicDxe.inf - INF ArmPkg/Drivers/TimerDxe/TimerDxe.inf - INF MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf - INF MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf - INF EmbeddedPkg/MetronomeDxe/MetronomeDxe.inf - - # - # FAT filesystem + GPT/MBR partitioning - # - INF MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf - INF MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf - INF FatPkg/EnhancedFatDxe/Fat.inf - INF MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf - INF MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf - - INF EmbeddedPkg/EmbeddedMonotonicCounter/EmbeddedMonotonicCounter.inf - INF MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystemRuntimeDxe.inf - INF EmbeddedPkg/RealTimeClockRuntimeDxe/RealTimeClockRuntimeDxe.inf - INF MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf - INF MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf - INF MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf - - INF MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.inf - INF MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf - INF MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf - - FILE DRIVER = f541d663-4a48-40aa-aabf-ff158ccae34c { - SECTION DXE_DEPEX = sdm845Pkg/Binary/845/SmemDxe/SmemDxe.depex - SECTION PE32 = sdm845Pkg/Binary/845/SmemDxe/SmemDxe.efi - SECTION UI = "SmemDxe" - } - - INF MdeModulePkg/Universal/BdsDxe/BdsDxe.inf - -} - - INF MdeModulePkg/Core/Dxe/DxeMain.inf - - # - # PI DXE Drivers producing Architectural Protocols (EFI Services) - # - INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf - INF ArmPkg/Drivers/CpuDxe/CpuDxe.inf - INF MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf - INF MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf - INF MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf - INF EmbeddedPkg/EmbeddedMonotonicCounter/EmbeddedMonotonicCounter.inf - INF MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystemRuntimeDxe.inf - INF EmbeddedPkg/RealTimeClockRuntimeDxe/RealTimeClockRuntimeDxe.inf - INF EmbeddedPkg/MetronomeDxe/MetronomeDxe.inf - - # - # Multiple Console IO support - # - INF MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.inf - INF MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf - INF MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf - INF MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf - - INF ArmPkg/Drivers/ArmGic/ArmGicDxe.inf - INF ArmPkg/Drivers/TimerDxe/TimerDxe.inf - - INF MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf - - FILE DRIVER = f541d663-4a48-40aa-aabf-ff158ccae34c { - SECTION DXE_DEPEX = sdm845Pkg/Binary/845/SmemDxe/SmemDxe.depex - SECTION PE32 = sdm845Pkg/Binary/845/SmemDxe/SmemDxe.efi - SECTION UI = "SmemDxe" - } - - FILE DRIVER = 0d35cd8e-97ea-4f9a-96af-0f0d89f76567 { - SECTION DXE_DEPEX = sdm845Pkg/Binary/845/UFSDxe/UFSDxe.depex - SECTION PE32 = sdm845Pkg/Binary/845/UFSDxe/UFSDxe.efi - SECTION UI = "UFSDxe" - } - - # - # Virtual Keyboard - # - INF EmbeddedPkg/Drivers/VirtualKeyboardDxe/VirtualKeyboardDxe.inf - - INF sdm845Pkg/Drivers/sdm845Dxe/sdm845Dxe.inf - INF sdm845Pkg/Drivers/SimpleFbDxe/SimpleFbDxe.inf - - # - # USB Host Support - # - INF MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf - - # - # USB Mass Storage Support - # - INF MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf - - # - # USB Peripheral Support - # - INF EmbeddedPkg/Drivers/AndroidFastbootTransportUsbDxe/FastbootTransportUsbDxe.inf - - # - # Fastboot - # - INF EmbeddedPkg/Application/AndroidFastboot/AndroidFastbootApp.inf - - # - # FAT filesystem + GPT/MBR partitioning - # - INF MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf - INF MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf - INF FatPkg/EnhancedFatDxe/Fat.inf - INF MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf - - INF MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf - - INF MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf - - # - # ACPI Support - # - INF MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf - INF MdeModulePkg/Universal/Acpi/AcpiPlatformDxe/AcpiPlatformDxe.inf - INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf - # INF RuleOverride = ACPITABLE sdm845Pkg/AcpiTables/AcpiTables.inf - - FILE FREEFORM = 7E374E25-8E01-4FEE-87F2-390C23C606CD { - SECTION RAW = sdm845Pkg/AcpiTables/testing/DBG2.aml - SECTION RAW = sdm845Pkg/AcpiTables/polaris/DSDT-gpu.aml - SECTION RAW = sdm845Pkg/AcpiTables/testing/MADT.aml - SECTION RAW = sdm845Pkg/AcpiTables/testing/FADT.aml - SECTION RAW = sdm845Pkg/AcpiTables/testing/GTDT.aml - SECTION RAW = sdm845Pkg/AcpiTables/testing/IORT.aml - SECTION RAW = sdm845Pkg/AcpiTables/testing/PPTT.aml - SECTION UI = "AcpiTables" - } - - # - # FDT support - # - INF EmbeddedPkg/Drivers/DtPlatformDxe/DtPlatformDxe.inf - - FILE FREEFORM = 25462CDA-221F-47DF-AC1D-259CFAA4E326 { - SECTION RAW = sdm845Pkg/FdtBlob/sdm845-xiaomi-polaris.dtb - } - - # - # SMBIOS Support - # - INF sdm845Pkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.inf - INF MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf - - # - # UEFI applications - # - INF ShellPkg/Application/Shell/Shell.inf -!ifdef $(INCLUDE_TFTP_COMMAND) - INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf -!endif #$(INCLUDE_TFTP_COMMAND) - - # - # Bds - # - INF MdeModulePkg/Universal/PrintDxe/PrintDxe.inf - INF MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf - INF MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf - INF MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf - INF MdeModulePkg/Universal/DriverHealthManagerDxe/DriverHealthManagerDxe.inf - INF MdeModulePkg/Universal/BdsDxe/BdsDxe.inf - INF MdeModulePkg/Application/UiApp/UiApp.inf - INF sdm845Pkg/Drivers/LogoDxe/LogoDxe.inf - -[FV.FVMAIN_COMPACT] -FvAlignment = 8 -ERASE_POLARITY = 1 -MEMORY_MAPPED = TRUE -STICKY_WRITE = TRUE -LOCK_CAP = TRUE -LOCK_STATUS = TRUE -WRITE_DISABLED_CAP = TRUE -WRITE_ENABLED_CAP = TRUE -WRITE_STATUS = TRUE -WRITE_LOCK_CAP = TRUE -WRITE_LOCK_STATUS = TRUE -READ_DISABLED_CAP = TRUE -READ_ENABLED_CAP = TRUE -READ_STATUS = TRUE -READ_LOCK_CAP = TRUE -READ_LOCK_STATUS = TRUE - - INF ArmPlatformPkg/PrePi/PeiUniCore.inf - - FILE FV_IMAGE = 9E21FD93-9C72-4c15-8C4B-E77F1DB2D792 { - SECTION GUIDED EE4E5898-3914-4259-9D6E-DC7BD79403CF PROCESSING_REQUIRED = TRUE { - SECTION FV_IMAGE = FVMAIN - } - } - -!include sdm845Pkg/CommonFdf.fdf.inc - - diff --git a/sdm845Pkg/Devices/polaris-usb.dsc b/sdm845Pkg/Devices/polaris-usb.dsc deleted file mode 100644 index 0f1ff5f..0000000 --- a/sdm845Pkg/Devices/polaris-usb.dsc +++ /dev/null @@ -1,22 +0,0 @@ -[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/polaris-usb.fdf - -!include sdm845Pkg/sdm845Pkg.dsc - -[BuildOptions.common] - GCC:*_*_AARCH64_CC_FLAGS = -DXIAOMI_PIL_FIXED=1 - -[PcdsFixedAtBuild.common] - # System Memory (5GB) - gArmTokenSpaceGuid.PcdSystemMemorySize|0x140000000 - - gsdm845PkgTokenSpaceGuid.PcdMipiFrameBufferWidth|1080 - gsdm845PkgTokenSpaceGuid.PcdMipiFrameBufferHeight|2160 diff --git a/sdm845Pkg/Devices/polaris-gpu.dsc b/sdm845Pkg/Devices/polaris.dsc similarity index 91% rename from sdm845Pkg/Devices/polaris-gpu.dsc rename to sdm845Pkg/Devices/polaris.dsc index 56d3b19..6facc36 100644 --- a/sdm845Pkg/Devices/polaris-gpu.dsc +++ b/sdm845Pkg/Devices/polaris.dsc @@ -7,7 +7,7 @@ SUPPORTED_ARCHITECTURES = AARCH64 BUILD_TARGETS = DEBUG|RELEASE SKUID_IDENTIFIER = DEFAULT - FLASH_DEFINITION = sdm845Pkg/Devices/polaris-gpu.fdf + FLASH_DEFINITION = sdm845Pkg/Devices/polaris.fdf !include sdm845Pkg/sdm845Pkg.dsc diff --git a/sdm845Pkg/Devices/polaris-usb.fdf b/sdm845Pkg/Devices/polaris.fdf similarity index 95% rename from sdm845Pkg/Devices/polaris-usb.fdf rename to sdm845Pkg/Devices/polaris.fdf index 742409b..e959ded 100644 --- a/sdm845Pkg/Devices/polaris-usb.fdf +++ b/sdm845Pkg/Devices/polaris.fdf @@ -53,7 +53,6 @@ NumBlocks = 0x200 # # Implement the Linux kernel header layout so that the loader will identify # it as something bootable, and execute it with a FDT pointer in x0 or r2. -# 0x00000000|0x00008000 DATA = { 0x01, 0x00, 0x00, 0x10, # code0: adr x1, . @@ -219,12 +218,6 @@ APRIORI DXE { SECTION UI = "ClockDxe" } - FILE DRIVER = 1B52138D-3FA3-4E50-B958-20887353F809 { - SECTION DXE_DEPEX = sdm845Pkg/Binary/845/CPRDxe/CPRDxe.depex - SECTION PE32 = sdm845Pkg/Binary/845/CPRDxe/CPRDxe.efi - SECTION UI = "CPRDxe" - } - FILE DRIVER = AF9763A2-033B-4109-8E17-56A98D380C92 { SECTION DXE_DEPEX = sdm845Pkg/Binary/845/DALTLMM/DALTLMM.depex SECTION PE32 = sdm845Pkg/Binary/845/DALTLMM/DALTLMM.efi @@ -410,12 +403,6 @@ APRIORI DXE { SECTION UI = "ClockDxe" } - FILE DRIVER = 1B52138D-3FA3-4E50-B958-20887353F809 { - SECTION DXE_DEPEX = sdm845Pkg/Binary/845/CPRDxe/CPRDxe.depex - SECTION PE32 = sdm845Pkg/Binary/845/CPRDxe/CPRDxe.efi - SECTION UI = "CPRDxe" - } - FILE DRIVER = AF9763A2-033B-4109-8E17-56A98D380C92 { SECTION DXE_DEPEX = sdm845Pkg/Binary/845/DALTLMM/DALTLMM.depex SECTION PE32 = sdm845Pkg/Binary/845/DALTLMM/DALTLMM.efi