Re: [Linaro-uefi] [PATCH 18/27] Hisilicon: Rename Pv660.dsc.inc to be Hisilicon common include

On Thu, Nov 10, 2016 at 09:52:22PM +0800, Heyi Guo wrote:

1. Rename Pv660.dsc.inc and Pv660.fdf.inc to Hisilicon and move it to Hisilicon root path.
2. Modify D02/D03 dsc and fdf accordingly.

Useful cleanup, thanks.

Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Heyi Guo heyi.guo@linaro.org

Reviewed-by: Leif Lindholm leif.lindholm@linaro.com

---

Chips/Hisilicon/Hisilicon.dsc.inc | 371 +++++++++++++++++++++++++++++++++++ Chips/Hisilicon/Hisilicon.fdf.inc | 139 +++++++++++++ Chips/Hisilicon/Pv660/Pv660.dsc.inc | 371 ----------------------------------- Chips/Hisilicon/Pv660/Pv660.fdf.inc | 139 ------------- Platforms/Hisilicon/D02/Pv660D02.dsc | 2 +- Platforms/Hisilicon/D02/Pv660D02.fdf | 2 +- Platforms/Hisilicon/D03/D03.dsc | 2 +- Platforms/Hisilicon/D03/D03.fdf | 2 +- 8 files changed, 514 insertions(+), 514 deletions(-) create mode 100644 Chips/Hisilicon/Hisilicon.dsc.inc create mode 100644 Chips/Hisilicon/Hisilicon.fdf.inc delete mode 100644 Chips/Hisilicon/Pv660/Pv660.dsc.inc delete mode 100644 Chips/Hisilicon/Pv660/Pv660.fdf.inc

diff --git a/Chips/Hisilicon/Hisilicon.dsc.inc b/Chips/Hisilicon/Hisilicon.dsc.inc new file mode 100644 index 0000000..510ee1d --- /dev/null +++ b/Chips/Hisilicon/Hisilicon.dsc.inc @@ -0,0 +1,371 @@ +# +# Copyright (c) 2011-2012, ARM Limited. All rights reserved. +# Copyright (c) 2016, Hisilicon Limited. All rights reserved. +# Copyright (c) 2016, 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. +# +#

+[LibraryClasses.common] +!if $(TARGET) == RELEASE

• DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf
• UncachedMemoryAllocationLib|ArmPkg/Library/UncachedMemoryAllocationLib/UncachedMemoryAllocationLib.inf

+!else

• DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf
• UncachedMemoryAllocationLib|ArmPkg/Library/UncachedMemoryAllocationLib/UncachedMemoryAllocationLib.inf

+!endif

• DebugPrintErrorLevelLib|MdePkg/Library/BaseDebugPrintErrorLevelLib/BaseDebugPrintErrorLevelLib.inf
• BaseLib|MdePkg/Library/BaseLib/BaseLib.inf
• SynchronizationLib|MdePkg/Library/BaseSynchronizationLib/BaseSynchronizationLib.inf
• PerformanceLib|MdePkg/Library/BasePerformanceLibNull/BasePerformanceLibNull.inf
• PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf
• PeCoffGetEntryPointLib|MdePkg/Library/BasePeCoffGetEntryPointLib/BasePeCoffGetEntryPointLib.inf
• PeCoffLib|MdePkg/Library/BasePeCoffLib/BasePeCoffLib.inf
• IoLib|MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf
• UefiDecompressLib|MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.inf
• CpuLib|MdePkg/Library/BaseCpuLib/BaseCpuLib.inf
• UefiLib|MdePkg/Library/UefiLib/UefiLib.inf
• HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf
• UefiRuntimeServicesTableLib|MdePkg/Library/UefiRuntimeServicesTableLib/UefiRuntimeServicesTableLib.inf
• DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf
• UefiBootServicesTableLib|MdePkg/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.inf
• DxeServicesTableLib|MdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.inf
• UefiDriverEntryPoint|MdePkg/Library/UefiDriverEntryPoint/UefiDriverEntryPoint.inf
• UefiApplicationEntryPoint|MdePkg/Library/UefiApplicationEntryPoint/UefiApplicationEntryPoint.inf
• HiiLib|MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf
• UefiHiiServicesLib|MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiServicesLib.inf
• UefiRuntimeLib|MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf
• OemHookStatusCodeLib|MdeModulePkg/Library/OemHookStatusCodeLibNull/OemHookStatusCodeLibNull.inf
• #
• # Allow dynamic PCDs
• #
• PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf
• BaseMemoryLib|MdePkg/Library/BaseMemoryLibOptDxe/BaseMemoryLibOptDxe.inf
• # ARM Architectural Libraries
• CacheMaintenanceLib|ArmPkg/Library/ArmCacheMaintenanceLib/ArmCacheMaintenanceLib.inf
• DefaultExceptionHandlerLib|ArmPkg/Library/DefaultExceptionHandlerLib/DefaultExceptionHandlerLib.inf
• CpuExceptionHandlerLib|ArmPkg/Library/ArmExceptionLib/ArmExceptionLib.inf
• ArmDisassemblerLib|ArmPkg/Library/ArmDisassemblerLib/ArmDisassemblerLib.inf
• DmaLib|ArmPkg/Library/ArmDmaLib/ArmDmaLib.inf
• ArmGicLib|ArmPkg/Drivers/ArmGic/ArmGicLib.inf
• ArmGicArchLib|ArmPkg/Library/ArmGicArchLib/ArmGicArchLib.inf
• ArmPlatformStackLib|ArmPlatformPkg/Library/ArmPlatformStackLib/ArmPlatformStackLib.inf
• ArmSmcLib|ArmPkg/Library/ArmSmcLib/ArmSmcLib.inf
• ArmMmuLib|ArmPkg/Library/ArmMmuLib/ArmMmuBaseLib.inf
• # Versatile Express Specific Libraries
• ArmPlatformSysConfigLib|ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressSysConfigLib/ArmVExpressSysConfigLib.inf
• NorFlashPlatformLib|ArmPlatformPkg/ArmVExpressPkg/Library/NorFlashArmVExpressLib/NorFlashArmVExpressLib.inf
• EfiResetSystemLib|ArmPkg/Library/ArmPsciResetSystemLib/ArmPsciResetSystemLib.inf
• # ARM PL111 Lcd Driver
• LcdPlatformLib|ArmPlatformPkg/ArmVExpressPkg/Library/PL111LcdArmVExpressLib/PL111LcdArmVExpressLib.inf
• # ARM PL354 SMC Driver
• PL35xSmcLib|ArmPlatformPkg/Drivers/PL35xSmc/PL35xSmc.inf
• # ARM PL011 UART Driver
• PL011UartLib|ArmPlatformPkg/Drivers/PL011Uart/PL011Uart.inf
• SerialPortLib|OpenPlatformPkg/Chips/Hisilicon/Library/Dw8250SerialPortLib/Dw8250SerialPortLib.inf
• TimerLib|ArmPkg/Library/ArmArchTimerLib/ArmArchTimerLib.inf
• # EBL Related Libraries
• EblCmdLib|ArmPlatformPkg/Library/EblCmdLib/EblCmdLib.inf
• EfiFileLib|EmbeddedPkg/Library/EfiFileLib/EfiFileLib.inf
• EblAddExternalCommandLib|EmbeddedPkg/Library/EblAddExternalCommandLib/EblAddExternalCommandLib.inf
• EblNetworkLib|EmbeddedPkg/Library/EblNetworkLib/EblNetworkLib.inf
• UefiDevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf
• #
• # Uncomment (and comment out the next line) For RealView Debugger. The Standard IO window
• # in the debugger will show load and unload commands for symbols. You can cut and paste this
• # into the command window to load symbols. We should be able to use a script to do this, but
• # the version of RVD I have does not support scripts accessing system memory.
• #
• #PeCoffExtraActionLib|ArmPkg/Library/RvdPeCoffExtraActionLib/RvdPeCoffExtraActionLib.inf
• #PeCoffExtraActionLib|MdePkg/Library/BasePeCoffExtraActionLibNull/BasePeCoffExtraActionLibNull.inf
• PeCoffExtraActionLib|ArmPkg/Library/DebugPeCoffExtraActionLib/DebugPeCoffExtraActionLib.inf
• DebugAgentLib|MdeModulePkg/Library/DebugAgentLibNull/DebugAgentLibNull.inf
• DebugAgentTimerLib|EmbeddedPkg/Library/DebugAgentTimerLibNull/DebugAgentTimerLibNull.inf
• SemihostLib|ArmPkg/Library/SemihostLib/SemihostLib.inf
• TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf
• AuthVariableLib|MdeModulePkg/Library/AuthVariableLibNull/AuthVariableLibNull.inf
• # BDS Libraries
• BdsLib|ArmPkg/Library/BdsLib/BdsLib.inf
• FdtLib|EmbeddedPkg/Library/FdtLib/FdtLib.inf
• UefiDevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf
• VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf
• ExtractGuidedSectionLib|MdePkg/Library/DxeExtractGuidedSectionLib/DxeExtractGuidedSectionLib.inf
• LzmaDecompressLib|IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf
• # Use ArmCortexA5xLib to get A57 specific functions
• ArmCpuLib|ArmPkg/Drivers/ArmCpuLib/ArmCortexA5xLib/ArmCortexA5xLib.inf
• #
• # It is not possible to prevent the ARM compiler for generic intrinsic functions.
• # This library provides the instrinsic functions generate by a given compiler.
• # And NULL mean link this library into all ARM images.
• #
• NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf
• # Add support for GCC stack protector
• NULL|MdePkg/Library/BaseStackCheckLib/BaseStackCheckLib.inf

+[LibraryClasses.common.SEC]

• ArmPlatformSecExtraActionLib|ArmPlatformPkg/Library/DebugSecExtraActionLib/DebugSecExtraActionLib.inf
• DefaultExceptionHandlerLib|ArmPkg/Library/DefaultExceptionHandlerLib/DefaultExceptionHandlerLibBase.inf
• # Trustzone Support
• ArmTrustedMonitorLib|ArmPlatformPkg/Library/ArmTrustedMonitorLibNull/ArmTrustedMonitorLibNull.inf
• ArmGicArchLib|ArmPkg/Library/ArmGicArchSecLib/ArmGicArchSecLib.inf
• PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf
• BaseMemoryLib|MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf

+[LibraryClasses.common.PEI_CORE]

• HobLib|MdePkg/Library/PeiHobLib/PeiHobLib.inf
• PeiServicesLib|MdePkg/Library/PeiServicesLib/PeiServicesLib.inf
• MemoryAllocationLib|MdePkg/Library/PeiMemoryAllocationLib/PeiMemoryAllocationLib.inf
• PeiCoreEntryPoint|MdePkg/Library/PeiCoreEntryPoint/PeiCoreEntryPoint.inf
• PerformanceLib|MdeModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib.inf
• ReportStatusCodeLib|MdeModulePkg/Library/PeiReportStatusCodeLib/PeiReportStatusCodeLib.inf
• OemHookStatusCodeLib|MdeModulePkg/Library/OemHookStatusCodeLibNull/OemHookStatusCodeLibNull.inf
• PeCoffGetEntryPointLib|MdePkg/Library/BasePeCoffGetEntryPointLib/BasePeCoffGetEntryPointLib.inf
• UefiDecompressLib|MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.inf
• ExtractGuidedSectionLib|MdePkg/Library/PeiExtractGuidedSectionLib/PeiExtractGuidedSectionLib.inf
• PeiServicesTablePointerLib|ArmPkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointerLib.inf
• PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf
• BaseMemoryLib|MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf

+[LibraryClasses.common.PEIM]

• HobLib|MdePkg/Library/PeiHobLib/PeiHobLib.inf
• PeiServicesLib|MdePkg/Library/PeiServicesLib/PeiServicesLib.inf
• MemoryAllocationLib|MdePkg/Library/PeiMemoryAllocationLib/PeiMemoryAllocationLib.inf
• PeimEntryPoint|MdePkg/Library/PeimEntryPoint/PeimEntryPoint.inf
• PerformanceLib|MdeModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib.inf
• ReportStatusCodeLib|MdeModulePkg/Library/PeiReportStatusCodeLib/PeiReportStatusCodeLib.inf
• OemHookStatusCodeLib|MdeModulePkg/Library/OemHookStatusCodeLibNull/OemHookStatusCodeLibNull.inf
• PeCoffGetEntryPointLib|MdePkg/Library/BasePeCoffGetEntryPointLib/BasePeCoffGetEntryPointLib.inf
• PeiResourcePublicationLib|MdePkg/Library/PeiResourcePublicationLib/PeiResourcePublicationLib.inf
• UefiDecompressLib|MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.inf
• ExtractGuidedSectionLib|MdePkg/Library/PeiExtractGuidedSectionLib/PeiExtractGuidedSectionLib.inf
• PeiServicesTablePointerLib|ArmPkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointerLib.inf
• ## Fixed compile error after upgrade to 14.10
• PlatformPeiLib|ArmPlatformPkg/PlatformPei/PlatformPeiLib.inf
• PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf
• ArmMmuLib|ArmPkg/Library/ArmMmuLib/ArmMmuPeiLib.inf
• BaseMemoryLib|MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf

+[LibraryClasses.common.DXE_CORE]

• HobLib|MdePkg/Library/DxeCoreHobLib/DxeCoreHobLib.inf
• MemoryAllocationLib|MdeModulePkg/Library/DxeCoreMemoryAllocationLib/DxeCoreMemoryAllocationLib.inf
• DxeCoreEntryPoint|MdePkg/Library/DxeCoreEntryPoint/DxeCoreEntryPoint.inf
• ReportStatusCodeLib|IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/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
• 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
• PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf
• MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf
• HiiLib|MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf
• ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf
• FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf
• SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf

+[LibraryClasses.common.UEFI_DRIVER]

• ReportStatusCodeLib|IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/DxeReportStatusCodeLib.inf
• UefiDecompressLib|IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.inf
• ExtractGuidedSectionLib|MdePkg/Library/DxeExtractGuidedSectionLib/DxeExtractGuidedSectionLib.inf
• PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf
• DxeServicesLib|MdePkg/Library/DxeServicesLib/DxeServicesLib.inf
• MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf

+[LibraryClasses.common.DXE_RUNTIME_DRIVER]

• HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf
• MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf
• ReportStatusCodeLib|MdeModulePkg/Library/RuntimeDxeReportStatusCodeLib/RuntimeDxeReportStatusCodeLib.inf
• CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.inf
• SerialPortLib|OpenPlatformPkg/Chips/Hisilicon/Library/Dw8250SerialPortRuntimeLib/Dw8250SerialPortRuntimeLib.inf
• DebugLib|IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf

+[LibraryClasses.AARCH64]

• ArmGenericTimerCounterLib|ArmPkg/Library/ArmGenericTimerPhyCounterLib/ArmGenericTimerPhyCounterLib.inf

+[BuildOptions]

• RVCT:RELEASE_*_*_CC_FLAGS = -DMDEPKG_NDEBUG
• GCC:RELEASE_*_*_CC_FLAGS = -DMDEPKG_NDEBUG

+[BuildOptions.common.EDKII.DXE_RUNTIME_DRIVER]

• GCC:*_*_ARM_DLINK_FLAGS = -z common-page-size=0x1000
• GCC:*_*_AARCH64_DLINK_FLAGS = -z common-page-size=0x10000

+################################################################################ +# +# Pcd Section - list of all EDK II PCD Entries defined by this Platform +# +################################################################################

+[PcdsFeatureFlag.common]

• gEfiMdePkgTokenSpaceGuid.PcdComponentNameDisable|TRUE
• gEfiMdePkgTokenSpaceGuid.PcdDriverDiagnosticsDisable|TRUE
• gEfiMdePkgTokenSpaceGuid.PcdComponentName2Disable|TRUE
• gEfiMdePkgTokenSpaceGuid.PcdDriverDiagnostics2Disable|TRUE
• #
• # Control what commands are supported from the UI
• # Turn these on and off to add features or save size
• #
• ## Set PcdEmbeddedMacBoot to FALSE, or console mode will be changed when
• ## entering EBL and not restored when exiting.
• gEmbeddedTokenSpaceGuid.PcdEmbeddedMacBoot|FALSE
• gEmbeddedTokenSpaceGuid.PcdEmbeddedDirCmd|TRUE
• gEmbeddedTokenSpaceGuid.PcdEmbeddedHobCmd|TRUE
• gEmbeddedTokenSpaceGuid.PcdEmbeddedHwDebugCmd|TRUE
• gEmbeddedTokenSpaceGuid.PcdEmbeddedPciDebugCmd|TRUE
• gEmbeddedTokenSpaceGuid.PcdEmbeddedIoEnable|FALSE
• gEmbeddedTokenSpaceGuid.PcdEmbeddedScriptCmd|FALSE
• gEmbeddedTokenSpaceGuid.PcdCacheEnable|TRUE
• # Use the Vector Table location in CpuDxe. We will not copy the Vector Table at PcdCpuVectorBaseAddress
• gArmTokenSpaceGuid.PcdRelocateVectorTable|FALSE
• gEmbeddedTokenSpaceGuid.PcdPrePiProduceMemoryTypeInformationHob|TRUE
• gEfiMdeModulePkgTokenSpaceGuid.PcdTurnOffUsbLegacySupport|TRUE
• gEfiMdeModulePkgTokenSpaceGuid.PcdInstallAcpiSdtProtocol|TRUE
• gArmTokenSpaceGuid.PcdArmGicV3WithV2Legacy|TRUE

+[PcdsFixedAtBuild.common]

• gArmPlatformTokenSpaceGuid.PcdFirmwareVendor|"ARM Versatile Express"
• gEmbeddedTokenSpaceGuid.PcdEmbeddedPrompt|"VExpress"
• gEmbeddedTokenSpaceGuid.PcdPrePiCpuMemorySize|44
• gEmbeddedTokenSpaceGuid.PcdPrePiCpuIoSize|0
• gEfiMdePkgTokenSpaceGuid.PcdMaximumUnicodeStringLength|1000000
• gEfiMdePkgTokenSpaceGuid.PcdMaximumAsciiStringLength|1000000
• gEfiMdePkgTokenSpaceGuid.PcdMaximumLinkedListLength|1000000
• gEfiMdePkgTokenSpaceGuid.PcdSpinLockTimeout|10000000
• gEfiMdePkgTokenSpaceGuid.PcdDebugClearMemoryValue|0xAF
• gEfiMdePkgTokenSpaceGuid.PcdPerformanceLibraryPropertyMask|1
• gEfiMdePkgTokenSpaceGuid.PcdPostCodePropertyMask|0
• gEfiMdePkgTokenSpaceGuid.PcdUefiLibMaxPrintBufferSize|320
• # DEBUG_ASSERT_ENABLED 0x01
• # DEBUG_PRINT_ENABLED 0x02
• # DEBUG_CODE_ENABLED 0x04
• # CLEAR_MEMORY_ENABLED 0x08
• # ASSERT_BREAKPOINT_ENABLED 0x10
• # ASSERT_DEADLOOP_ENABLED 0x20

+!if $(TARGET) == RELEASE

• gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x0e

+!else

• gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x0f

+!endif

• # DEBUG_INIT 0x00000001 // Initialization
• # DEBUG_WARN 0x00000002 // Warnings
• # DEBUG_LOAD 0x00000004 // Load events
• # DEBUG_FS 0x00000008 // EFI File system
• # DEBUG_POOL 0x00000010 // Alloc & Free's
• # DEBUG_PAGE 0x00000020 // Alloc & Free's
• # DEBUG_INFO 0x00000040 // Verbose
• # DEBUG_DISPATCH 0x00000080 // PEI/DXE Dispatchers
• # DEBUG_VARIABLE 0x00000100 // Variable
• # DEBUG_BM 0x00000400 // Boot Manager
• # DEBUG_BLKIO 0x00001000 // BlkIo Driver
• # DEBUG_NET 0x00004000 // SNI Driver
• # DEBUG_UNDI 0x00010000 // UNDI Driver
• # DEBUG_LOADFILE 0x00020000 // UNDI Driver
• # DEBUG_EVENT 0x00080000 // Event messages
• # DEBUG_ERROR 0x80000000 // Error
• gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x80000004
• gEfiMdePkgTokenSpaceGuid.PcdReportStatusCodePropertyMask|0x06
• gEmbeddedTokenSpaceGuid.PcdEmbeddedAutomaticBootCommand|""
• gEmbeddedTokenSpaceGuid.PcdEmbeddedDefaultTextColor|0x07
• gEmbeddedTokenSpaceGuid.PcdEmbeddedMemVariableStoreSize|0x10000
• #
• # Optional feature to help prevent EFI memory map fragments
• # Turned on and off via: PcdPrePiProduceMemoryTypeInformationHob
• # Values are in EFI Pages (4K). DXE Core will make sure that
• # at least this much of each type of memory can be allocated
• # from a single memory range. This way you only end up with
• # maximum of two fragements for each type in the memory map
• # (the memory used, and the free memory that was prereserved
• # but not used).
• #
• gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiACPIReclaimMemory|0
• gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiACPIMemoryNVS|0
• gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiReservedMemoryType|0
• gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiRuntimeServicesData|50
• gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiRuntimeServicesCode|20
• gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiBootServicesCode|400
• gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiBootServicesData|20000
• gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiLoaderCode|20
• gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiLoaderData|0
• #
• # ARM Pcds
• #
• gArmTokenSpaceGuid.PcdArmUncachedMemoryMask|0x0000000000000000
• #
• # ARM PrimeCell
• #
• #
• # ARM OS Loader
• #
• # Versatile Express machine type (ARM VERSATILE EXPRESS = 2272) required for ARM Linux:
• gArmPlatformTokenSpaceGuid.PcdDefaultBootDescription|L"Linux from NorFlash"
• gArmPlatformTokenSpaceGuid.PcdDefaultBootDevicePath|L"VenHw(E7223039-5836-41E1-B542-D7EC736C5E59)/MemoryMapped(0x0,0xED000000,0xED400000)"
• gArmPlatformTokenSpaceGuid.PcdDefaultBootArgument|""
• # Use the serial console (ConIn & ConOut) and the Graphic driver (ConOut)
• gArmPlatformTokenSpaceGuid.PcdDefaultConOutPaths|L"VenHw(D3987D4B-971A-435F-8CAF-4967EB627241)/Uart(38400,8,N,1)/VenPcAnsi();VenHw(CE660500-824D-11E0-AC72-0002A5D5C51B)"
• gArmPlatformTokenSpaceGuid.PcdDefaultConInPaths|L"VenHw(D3987D4B-971A-435F-8CAF-4967EB627241)/Uart(38400,8,N,1)/VenPcAnsi()"
• # Set timer interrupt to be triggerred in 1ms to avoid missing
• # serial terminal input characters.
• gEmbeddedTokenSpaceGuid.PcdTimerPeriod|10000
• gArmTokenSpaceGuid.PcdVFPEnabled|1
• gEfiMdePkgTokenSpaceGuid.PcdUartDefaultReceiveFifoDepth|32

+[PcdsDynamicHii.common.DEFAULT]

• gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut|L"Timeout"|gEfiGlobalVariableGuid|0x0|10 # Variable: L"Timeout"

diff --git a/Chips/Hisilicon/Hisilicon.fdf.inc b/Chips/Hisilicon/Hisilicon.fdf.inc new file mode 100644 index 0000000..ee87cd1 --- /dev/null +++ b/Chips/Hisilicon/Hisilicon.fdf.inc @@ -0,0 +1,139 @@ +#/** @file +# +# Copyright (c) 2016, Hisilicon Limited. All rights reserved. +# Copyright (c) 2016, 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. +# +#**/

+################################################################################ +# +# Rules are use with the [FV] section's module INF type to define +# how an FFS file is created for a given INF file. The following Rule are the default +# rules for the different module type. User can add the customized rules to define the +# content of the FFS file. +# +################################################################################

+############################################################################ +# Example of a DXE_DRIVER FFS file with a Checksum encapsulation section # +############################################################################ +# +#[Rule.Common.DXE_DRIVER] +# FILE DRIVER = $(NAMED_GUID) { +# DXE_DEPEX DXE_DEPEX Optional $(INF_OUTPUT)/$(MODULE_NAME).depex +# COMPRESS PI_STD { +# GUIDED { +# PE32 PE32 $(INF_OUTPUT)/$(MODULE_NAME).efi +# UI STRING="$(MODULE_NAME)" Optional +# VERSION STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER) +# } +# } +# } +# +############################################################################

+[Rule.Common.SEC]

• FILE SEC = $(NAMED_GUID) RELOCS_STRIPPED {
• TE TE Align = 4K $(INF_OUTPUT)/$(MODULE_NAME).efi
• }

+[Rule.Common.PEI_CORE]

• FILE PEI_CORE = $(NAMED_GUID) {
• TE TE Align = Auto $(INF_OUTPUT)/$(MODULE_NAME).efi
• UI STRING ="$(MODULE_NAME)" Optional
• }

+[Rule.Common.PEIM]

• FILE PEIM = $(NAMED_GUID) {

• PEI_DEPEX PEI_DEPEX Optional       $(INF_OUTPUT)/$(MODULE_NAME).depex
  

• TE       TE Align = Auto           $(INF_OUTPUT)/$(MODULE_NAME).efi
  

• UI       STRING="$(MODULE_NAME)" Optional
  

• }

+[Rule.Common.PEIM.BINARY]

• FILE PEIM = $(NAMED_GUID) {

• PEI_DEPEX PEI_DEPEX Optional       $(INF_OUTPUT)/$(MODULE_NAME).depex
  

• TE       TE Align = Auto           |.efi
  

• UI       STRING="$(MODULE_NAME)" Optional
  

• }

+[Rule.Common.PEIM.TIANOCOMPRESSED]

• FILE PEIM = $(NAMED_GUID) DEBUG_MYTOOLS_IA32 {
• PEI_DEPEX PEI_DEPEX Optional $(INF_OUTPUT)/$(MODULE_NAME).depex
• GUIDED A31280AD-481E-41B6-95E8-127F4C984779 PROCESSING_REQUIRED = TRUE {

•  PE32      PE32                    $(INF_OUTPUT)/$(MODULE_NAME).efi
  

•  UI        STRING="$(MODULE_NAME)" Optional
  

• }
• }

+[Rule.Common.DXE_CORE]

• FILE DXE_CORE = $(NAMED_GUID) {
• PE32 PE32 $(INF_OUTPUT)/$(MODULE_NAME).efi
• UI STRING="$(MODULE_NAME)" Optional
• }

+[Rule.Common.UEFI_DRIVER]

• FILE DRIVER = $(NAMED_GUID) {
• DXE_DEPEX DXE_DEPEX Optional $(INF_OUTPUT)/$(MODULE_NAME).depex
• PE32 PE32 $(INF_OUTPUT)/$(MODULE_NAME).efi
• UI STRING="$(MODULE_NAME)" Optional
• }

+[Rule.Common.DXE_DRIVER]

• FILE DRIVER = $(NAMED_GUID) {
• DXE_DEPEX DXE_DEPEX Optional $(INF_OUTPUT)/$(MODULE_NAME).depex
• PE32 PE32 $(INF_OUTPUT)/$(MODULE_NAME).efi
• UI STRING="$(MODULE_NAME)" Optional
• }

+[Rule.Common.DXE_DRIVER.BINARY]

• FILE DRIVER = $(NAMED_GUID) {
• DXE_DEPEX DXE_DEPEX Optional |.depex
• PE32 PE32 |.efi
• UI STRING="$(MODULE_NAME)" Optional
• }

+[Rule.Common.DXE_RUNTIME_DRIVER]

• FILE DRIVER = $(NAMED_GUID) {
• DXE_DEPEX DXE_DEPEX Optional $(INF_OUTPUT)/$(MODULE_NAME).depex
• PE32 PE32 $(INF_OUTPUT)/$(MODULE_NAME).efi
• UI STRING="$(MODULE_NAME)" Optional
• }

+[Rule.Common.UEFI_APPLICATION]

• FILE APPLICATION = $(NAMED_GUID) {
• UI STRING ="$(MODULE_NAME)" Optional
• PE32 PE32 $(INF_OUTPUT)/$(MODULE_NAME).efi
• }

+[Rule.Common.UEFI_DRIVER.BINARY]

• FILE DRIVER = $(NAMED_GUID) {
• DXE_DEPEX DXE_DEPEX Optional |.depex
• PE32 PE32 |.efi
• UI STRING="$(MODULE_NAME)" Optional
• VERSION STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)
• }

+[Rule.Common.UEFI_APPLICATION.BINARY]

• FILE APPLICATION = $(NAMED_GUID) {
• PE32 PE32 |.efi
• UI STRING="$(MODULE_NAME)" Optional
• VERSION STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)
• }

+[Rule.Common.USER_DEFINED.ACPITABLE]

• FILE FREEFORM = $(NAMED_GUID) {
• RAW ACPI |.acpi
• RAW ASL |.aml
• }

diff --git a/Chips/Hisilicon/Pv660/Pv660.dsc.inc b/Chips/Hisilicon/Pv660/Pv660.dsc.inc deleted file mode 100644 index d9ef115..0000000 --- a/Chips/Hisilicon/Pv660/Pv660.dsc.inc +++ /dev/null @@ -1,371 +0,0 @@ -# -# Copyright (c) 2011-2012, ARM Limited. All rights reserved. -# Copyright (c) 2015, Hisilicon Limited. All rights reserved. -# Copyright (c) 2015, 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. -# -#

-[LibraryClasses.common] -!if $(TARGET) == RELEASE

• DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf
• UncachedMemoryAllocationLib|ArmPkg/Library/UncachedMemoryAllocationLib/UncachedMemoryAllocationLib.inf

-!else

• DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf
• UncachedMemoryAllocationLib|ArmPkg/Library/UncachedMemoryAllocationLib/UncachedMemoryAllocationLib.inf

-!endif

• DebugPrintErrorLevelLib|MdePkg/Library/BaseDebugPrintErrorLevelLib/BaseDebugPrintErrorLevelLib.inf
• BaseLib|MdePkg/Library/BaseLib/BaseLib.inf
• SynchronizationLib|MdePkg/Library/BaseSynchronizationLib/BaseSynchronizationLib.inf
• PerformanceLib|MdePkg/Library/BasePerformanceLibNull/BasePerformanceLibNull.inf
• PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf
• PeCoffGetEntryPointLib|MdePkg/Library/BasePeCoffGetEntryPointLib/BasePeCoffGetEntryPointLib.inf
• PeCoffLib|MdePkg/Library/BasePeCoffLib/BasePeCoffLib.inf
• IoLib|MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf
• UefiDecompressLib|MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.inf
• CpuLib|MdePkg/Library/BaseCpuLib/BaseCpuLib.inf
• UefiLib|MdePkg/Library/UefiLib/UefiLib.inf
• HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf
• UefiRuntimeServicesTableLib|MdePkg/Library/UefiRuntimeServicesTableLib/UefiRuntimeServicesTableLib.inf
• DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf
• UefiBootServicesTableLib|MdePkg/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.inf
• DxeServicesTableLib|MdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.inf
• UefiDriverEntryPoint|MdePkg/Library/UefiDriverEntryPoint/UefiDriverEntryPoint.inf
• UefiApplicationEntryPoint|MdePkg/Library/UefiApplicationEntryPoint/UefiApplicationEntryPoint.inf
• HiiLib|MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf
• UefiHiiServicesLib|MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiServicesLib.inf
• UefiRuntimeLib|MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf
• OemHookStatusCodeLib|MdeModulePkg/Library/OemHookStatusCodeLibNull/OemHookStatusCodeLibNull.inf
• #
• # Allow dynamic PCDs
• #
• PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf
• BaseMemoryLib|MdePkg/Library/BaseMemoryLibOptDxe/BaseMemoryLibOptDxe.inf
• # ARM Architectural Libraries
• CacheMaintenanceLib|ArmPkg/Library/ArmCacheMaintenanceLib/ArmCacheMaintenanceLib.inf
• DefaultExceptionHandlerLib|ArmPkg/Library/DefaultExceptionHandlerLib/DefaultExceptionHandlerLib.inf
• CpuExceptionHandlerLib|ArmPkg/Library/ArmExceptionLib/ArmExceptionLib.inf
• ArmDisassemblerLib|ArmPkg/Library/ArmDisassemblerLib/ArmDisassemblerLib.inf
• DmaLib|ArmPkg/Library/ArmDmaLib/ArmDmaLib.inf
• ArmGicLib|ArmPkg/Drivers/ArmGic/ArmGicLib.inf
• ArmGicArchLib|ArmPkg/Library/ArmGicArchLib/ArmGicArchLib.inf
• ArmPlatformStackLib|ArmPlatformPkg/Library/ArmPlatformStackLib/ArmPlatformStackLib.inf
• ArmSmcLib|ArmPkg/Library/ArmSmcLib/ArmSmcLib.inf
• ArmMmuLib|ArmPkg/Library/ArmMmuLib/ArmMmuBaseLib.inf
• # Versatile Express Specific Libraries
• ArmPlatformSysConfigLib|ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressSysConfigLib/ArmVExpressSysConfigLib.inf
• NorFlashPlatformLib|ArmPlatformPkg/ArmVExpressPkg/Library/NorFlashArmVExpressLib/NorFlashArmVExpressLib.inf
• EfiResetSystemLib|ArmPkg/Library/ArmPsciResetSystemLib/ArmPsciResetSystemLib.inf
• # ARM PL111 Lcd Driver
• LcdPlatformLib|ArmPlatformPkg/ArmVExpressPkg/Library/PL111LcdArmVExpressLib/PL111LcdArmVExpressLib.inf
• # ARM PL354 SMC Driver
• PL35xSmcLib|ArmPlatformPkg/Drivers/PL35xSmc/PL35xSmc.inf
• # ARM PL011 UART Driver
• PL011UartLib|ArmPlatformPkg/Drivers/PL011Uart/PL011Uart.inf
• SerialPortLib|OpenPlatformPkg/Chips/Hisilicon/Library/Dw8250SerialPortLib/Dw8250SerialPortLib.inf
• TimerLib|ArmPkg/Library/ArmArchTimerLib/ArmArchTimerLib.inf
• # EBL Related Libraries
• EblCmdLib|ArmPlatformPkg/Library/EblCmdLib/EblCmdLib.inf
• EfiFileLib|EmbeddedPkg/Library/EfiFileLib/EfiFileLib.inf
• EblAddExternalCommandLib|EmbeddedPkg/Library/EblAddExternalCommandLib/EblAddExternalCommandLib.inf
• EblNetworkLib|EmbeddedPkg/Library/EblNetworkLib/EblNetworkLib.inf
• UefiDevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf
• #
• # Uncomment (and comment out the next line) For RealView Debugger. The Standard IO window
• # in the debugger will show load and unload commands for symbols. You can cut and paste this
• # into the command window to load symbols. We should be able to use a script to do this, but
• # the version of RVD I have does not support scripts accessing system memory.
• #
• #PeCoffExtraActionLib|ArmPkg/Library/RvdPeCoffExtraActionLib/RvdPeCoffExtraActionLib.inf
• #PeCoffExtraActionLib|MdePkg/Library/BasePeCoffExtraActionLibNull/BasePeCoffExtraActionLibNull.inf
• PeCoffExtraActionLib|ArmPkg/Library/DebugPeCoffExtraActionLib/DebugPeCoffExtraActionLib.inf
• DebugAgentLib|MdeModulePkg/Library/DebugAgentLibNull/DebugAgentLibNull.inf
• DebugAgentTimerLib|EmbeddedPkg/Library/DebugAgentTimerLibNull/DebugAgentTimerLibNull.inf
• SemihostLib|ArmPkg/Library/SemihostLib/SemihostLib.inf
• TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf
• AuthVariableLib|MdeModulePkg/Library/AuthVariableLibNull/AuthVariableLibNull.inf
• # BDS Libraries
• BdsLib|ArmPkg/Library/BdsLib/BdsLib.inf
• FdtLib|EmbeddedPkg/Library/FdtLib/FdtLib.inf
• UefiDevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf
• VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf
• ExtractGuidedSectionLib|MdePkg/Library/DxeExtractGuidedSectionLib/DxeExtractGuidedSectionLib.inf
• LzmaDecompressLib|IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf
• # Use ArmCortexA5xLib to get A57 specific functions
• ArmCpuLib|ArmPkg/Drivers/ArmCpuLib/ArmCortexA5xLib/ArmCortexA5xLib.inf
• #
• # It is not possible to prevent the ARM compiler for generic intrinsic functions.
• # This library provides the instrinsic functions generate by a given compiler.
• # And NULL mean link this library into all ARM images.
• #
• NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf
• # Add support for GCC stack protector
• NULL|MdePkg/Library/BaseStackCheckLib/BaseStackCheckLib.inf

-[LibraryClasses.common.SEC]

• ArmPlatformSecExtraActionLib|ArmPlatformPkg/Library/DebugSecExtraActionLib/DebugSecExtraActionLib.inf
• DefaultExceptionHandlerLib|ArmPkg/Library/DefaultExceptionHandlerLib/DefaultExceptionHandlerLibBase.inf
• # Trustzone Support
• ArmTrustedMonitorLib|ArmPlatformPkg/Library/ArmTrustedMonitorLibNull/ArmTrustedMonitorLibNull.inf
• ArmGicArchLib|ArmPkg/Library/ArmGicArchSecLib/ArmGicArchSecLib.inf
• PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf
• BaseMemoryLib|MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf

-[LibraryClasses.common.PEI_CORE]

• HobLib|MdePkg/Library/PeiHobLib/PeiHobLib.inf
• PeiServicesLib|MdePkg/Library/PeiServicesLib/PeiServicesLib.inf
• MemoryAllocationLib|MdePkg/Library/PeiMemoryAllocationLib/PeiMemoryAllocationLib.inf
• PeiCoreEntryPoint|MdePkg/Library/PeiCoreEntryPoint/PeiCoreEntryPoint.inf
• PerformanceLib|MdeModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib.inf
• ReportStatusCodeLib|MdeModulePkg/Library/PeiReportStatusCodeLib/PeiReportStatusCodeLib.inf
• OemHookStatusCodeLib|MdeModulePkg/Library/OemHookStatusCodeLibNull/OemHookStatusCodeLibNull.inf
• PeCoffGetEntryPointLib|MdePkg/Library/BasePeCoffGetEntryPointLib/BasePeCoffGetEntryPointLib.inf
• UefiDecompressLib|MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.inf
• ExtractGuidedSectionLib|MdePkg/Library/PeiExtractGuidedSectionLib/PeiExtractGuidedSectionLib.inf
• PeiServicesTablePointerLib|ArmPkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointerLib.inf
• PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf
• BaseMemoryLib|MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf

-[LibraryClasses.common.PEIM]

• HobLib|MdePkg/Library/PeiHobLib/PeiHobLib.inf
• PeiServicesLib|MdePkg/Library/PeiServicesLib/PeiServicesLib.inf
• MemoryAllocationLib|MdePkg/Library/PeiMemoryAllocationLib/PeiMemoryAllocationLib.inf
• PeimEntryPoint|MdePkg/Library/PeimEntryPoint/PeimEntryPoint.inf
• PerformanceLib|MdeModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib.inf
• ReportStatusCodeLib|MdeModulePkg/Library/PeiReportStatusCodeLib/PeiReportStatusCodeLib.inf
• OemHookStatusCodeLib|MdeModulePkg/Library/OemHookStatusCodeLibNull/OemHookStatusCodeLibNull.inf
• PeCoffGetEntryPointLib|MdePkg/Library/BasePeCoffGetEntryPointLib/BasePeCoffGetEntryPointLib.inf
• PeiResourcePublicationLib|MdePkg/Library/PeiResourcePublicationLib/PeiResourcePublicationLib.inf
• UefiDecompressLib|MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.inf
• ExtractGuidedSectionLib|MdePkg/Library/PeiExtractGuidedSectionLib/PeiExtractGuidedSectionLib.inf
• PeiServicesTablePointerLib|ArmPkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointerLib.inf
• ## Fixed compile error after upgrade to 14.10
• PlatformPeiLib|ArmPlatformPkg/PlatformPei/PlatformPeiLib.inf
• PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf
• ArmMmuLib|ArmPkg/Library/ArmMmuLib/ArmMmuPeiLib.inf
• BaseMemoryLib|MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf

-[LibraryClasses.common.DXE_CORE]

• HobLib|MdePkg/Library/DxeCoreHobLib/DxeCoreHobLib.inf
• MemoryAllocationLib|MdeModulePkg/Library/DxeCoreMemoryAllocationLib/DxeCoreMemoryAllocationLib.inf
• DxeCoreEntryPoint|MdePkg/Library/DxeCoreEntryPoint/DxeCoreEntryPoint.inf
• ReportStatusCodeLib|IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/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
• 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
• PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf
• MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf
• HiiLib|MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf
• ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf
• FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf
• SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf

-[LibraryClasses.common.UEFI_DRIVER]

• ReportStatusCodeLib|IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/DxeReportStatusCodeLib.inf
• UefiDecompressLib|IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.inf
• ExtractGuidedSectionLib|MdePkg/Library/DxeExtractGuidedSectionLib/DxeExtractGuidedSectionLib.inf
• PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf
• DxeServicesLib|MdePkg/Library/DxeServicesLib/DxeServicesLib.inf
• MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf

-[LibraryClasses.common.DXE_RUNTIME_DRIVER]

• HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf
• MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf
• ReportStatusCodeLib|MdeModulePkg/Library/RuntimeDxeReportStatusCodeLib/RuntimeDxeReportStatusCodeLib.inf
• CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.inf
• SerialPortLib|OpenPlatformPkg/Chips/Hisilicon/Library/Dw8250SerialPortRuntimeLib/Dw8250SerialPortRuntimeLib.inf
• DebugLib|IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf

-[LibraryClasses.AARCH64]

• ArmGenericTimerCounterLib|ArmPkg/Library/ArmGenericTimerPhyCounterLib/ArmGenericTimerPhyCounterLib.inf

-[BuildOptions]

• RVCT:RELEASE_*_*_CC_FLAGS = -DMDEPKG_NDEBUG
• GCC:RELEASE_*_*_CC_FLAGS = -DMDEPKG_NDEBUG

-[BuildOptions.common.EDKII.DXE_RUNTIME_DRIVER]

• GCC:*_*_ARM_DLINK_FLAGS = -z common-page-size=0x1000
• GCC:*_*_AARCH64_DLINK_FLAGS = -z common-page-size=0x10000

-################################################################################ -# -# Pcd Section - list of all EDK II PCD Entries defined by this Platform -# -################################################################################

-[PcdsFeatureFlag.common]

• gEfiMdePkgTokenSpaceGuid.PcdComponentNameDisable|TRUE
• gEfiMdePkgTokenSpaceGuid.PcdDriverDiagnosticsDisable|TRUE
• gEfiMdePkgTokenSpaceGuid.PcdComponentName2Disable|TRUE
• gEfiMdePkgTokenSpaceGuid.PcdDriverDiagnostics2Disable|TRUE
• #
• # Control what commands are supported from the UI
• # Turn these on and off to add features or save size
• #
• ## Set PcdEmbeddedMacBoot to FALSE, or console mode will be changed when
• ## entering EBL and not restored when exiting.
• gEmbeddedTokenSpaceGuid.PcdEmbeddedMacBoot|FALSE
• gEmbeddedTokenSpaceGuid.PcdEmbeddedDirCmd|TRUE
• gEmbeddedTokenSpaceGuid.PcdEmbeddedHobCmd|TRUE
• gEmbeddedTokenSpaceGuid.PcdEmbeddedHwDebugCmd|TRUE
• gEmbeddedTokenSpaceGuid.PcdEmbeddedPciDebugCmd|TRUE
• gEmbeddedTokenSpaceGuid.PcdEmbeddedIoEnable|FALSE
• gEmbeddedTokenSpaceGuid.PcdEmbeddedScriptCmd|FALSE
• gEmbeddedTokenSpaceGuid.PcdCacheEnable|TRUE
• # Use the Vector Table location in CpuDxe. We will not copy the Vector Table at PcdCpuVectorBaseAddress
• gArmTokenSpaceGuid.PcdRelocateVectorTable|FALSE
• gEmbeddedTokenSpaceGuid.PcdPrePiProduceMemoryTypeInformationHob|TRUE
• gEfiMdeModulePkgTokenSpaceGuid.PcdTurnOffUsbLegacySupport|TRUE
• gEfiMdeModulePkgTokenSpaceGuid.PcdInstallAcpiSdtProtocol|TRUE
• gArmTokenSpaceGuid.PcdArmGicV3WithV2Legacy|TRUE

-[PcdsFixedAtBuild.common]

• gArmPlatformTokenSpaceGuid.PcdFirmwareVendor|"ARM Versatile Express"
• gEmbeddedTokenSpaceGuid.PcdEmbeddedPrompt|"VExpress"
• gEmbeddedTokenSpaceGuid.PcdPrePiCpuMemorySize|44
• gEmbeddedTokenSpaceGuid.PcdPrePiCpuIoSize|0
• gEfiMdePkgTokenSpaceGuid.PcdMaximumUnicodeStringLength|1000000
• gEfiMdePkgTokenSpaceGuid.PcdMaximumAsciiStringLength|1000000
• gEfiMdePkgTokenSpaceGuid.PcdMaximumLinkedListLength|1000000
• gEfiMdePkgTokenSpaceGuid.PcdSpinLockTimeout|10000000
• gEfiMdePkgTokenSpaceGuid.PcdDebugClearMemoryValue|0xAF
• gEfiMdePkgTokenSpaceGuid.PcdPerformanceLibraryPropertyMask|1
• gEfiMdePkgTokenSpaceGuid.PcdPostCodePropertyMask|0
• gEfiMdePkgTokenSpaceGuid.PcdUefiLibMaxPrintBufferSize|320
• # DEBUG_ASSERT_ENABLED 0x01
• # DEBUG_PRINT_ENABLED 0x02
• # DEBUG_CODE_ENABLED 0x04
• # CLEAR_MEMORY_ENABLED 0x08
• # ASSERT_BREAKPOINT_ENABLED 0x10
• # ASSERT_DEADLOOP_ENABLED 0x20

-!if $(TARGET) == RELEASE

• gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x0e

-!else

• gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x0f

-!endif

• # DEBUG_INIT 0x00000001 // Initialization
• # DEBUG_WARN 0x00000002 // Warnings
• # DEBUG_LOAD 0x00000004 // Load events
• # DEBUG_FS 0x00000008 // EFI File system
• # DEBUG_POOL 0x00000010 // Alloc & Free's
• # DEBUG_PAGE 0x00000020 // Alloc & Free's
• # DEBUG_INFO 0x00000040 // Verbose
• # DEBUG_DISPATCH 0x00000080 // PEI/DXE Dispatchers
• # DEBUG_VARIABLE 0x00000100 // Variable
• # DEBUG_BM 0x00000400 // Boot Manager
• # DEBUG_BLKIO 0x00001000 // BlkIo Driver
• # DEBUG_NET 0x00004000 // SNI Driver
• # DEBUG_UNDI 0x00010000 // UNDI Driver
• # DEBUG_LOADFILE 0x00020000 // UNDI Driver
• # DEBUG_EVENT 0x00080000 // Event messages
• # DEBUG_ERROR 0x80000000 // Error
• gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x80000004
• gEfiMdePkgTokenSpaceGuid.PcdReportStatusCodePropertyMask|0x06
• gEmbeddedTokenSpaceGuid.PcdEmbeddedAutomaticBootCommand|""
• gEmbeddedTokenSpaceGuid.PcdEmbeddedDefaultTextColor|0x07
• gEmbeddedTokenSpaceGuid.PcdEmbeddedMemVariableStoreSize|0x10000
• #
• # Optional feature to help prevent EFI memory map fragments
• # Turned on and off via: PcdPrePiProduceMemoryTypeInformationHob
• # Values are in EFI Pages (4K). DXE Core will make sure that
• # at least this much of each type of memory can be allocated
• # from a single memory range. This way you only end up with
• # maximum of two fragements for each type in the memory map
• # (the memory used, and the free memory that was prereserved
• # but not used).
• #
• gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiACPIReclaimMemory|0
• gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiACPIMemoryNVS|0
• gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiReservedMemoryType|0
• gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiRuntimeServicesData|50
• gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiRuntimeServicesCode|20
• gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiBootServicesCode|400
• gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiBootServicesData|20000
• gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiLoaderCode|20
• gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiLoaderData|0
• #
• # ARM Pcds
• #
• gArmTokenSpaceGuid.PcdArmUncachedMemoryMask|0x0000000000000000
• #
• # ARM PrimeCell
• #
• #
• # ARM OS Loader
• #
• # Versatile Express machine type (ARM VERSATILE EXPRESS = 2272) required for ARM Linux:
• gArmPlatformTokenSpaceGuid.PcdDefaultBootDescription|L"Linux from NorFlash"
• gArmPlatformTokenSpaceGuid.PcdDefaultBootDevicePath|L"VenHw(E7223039-5836-41E1-B542-D7EC736C5E59)/MemoryMapped(0x0,0xED000000,0xED400000)"
• gArmPlatformTokenSpaceGuid.PcdDefaultBootArgument|""
• # Use the serial console (ConIn & ConOut) and the Graphic driver (ConOut)
• gArmPlatformTokenSpaceGuid.PcdDefaultConOutPaths|L"VenHw(D3987D4B-971A-435F-8CAF-4967EB627241)/Uart(38400,8,N,1)/VenPcAnsi();VenHw(CE660500-824D-11E0-AC72-0002A5D5C51B)"
• gArmPlatformTokenSpaceGuid.PcdDefaultConInPaths|L"VenHw(D3987D4B-971A-435F-8CAF-4967EB627241)/Uart(38400,8,N,1)/VenPcAnsi()"
• # Set timer interrupt to be triggerred in 1ms to avoid missing
• # serial terminal input characters.
• gEmbeddedTokenSpaceGuid.PcdTimerPeriod|10000
• gArmTokenSpaceGuid.PcdVFPEnabled|1
• gEfiMdePkgTokenSpaceGuid.PcdUartDefaultReceiveFifoDepth|32

-[PcdsDynamicHii.common.DEFAULT]

• gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut|L"Timeout"|gEfiGlobalVariableGuid|0x0|10 # Variable: L"Timeout"

diff --git a/Chips/Hisilicon/Pv660/Pv660.fdf.inc b/Chips/Hisilicon/Pv660/Pv660.fdf.inc deleted file mode 100644 index c5f0e8b..0000000 --- a/Chips/Hisilicon/Pv660/Pv660.fdf.inc +++ /dev/null @@ -1,139 +0,0 @@ -#/** @file -# -# Copyright (c) 2015, Hisilicon Limited. All rights reserved. -# Copyright (c) 2015, 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. -# -#**/

-################################################################################ -# -# Rules are use with the [FV] section's module INF type to define -# how an FFS file is created for a given INF file. The following Rule are the default -# rules for the different module type. User can add the customized rules to define the -# content of the FFS file. -# -################################################################################

-############################################################################ -# Example of a DXE_DRIVER FFS file with a Checksum encapsulation section # -############################################################################ -# -#[Rule.Common.DXE_DRIVER] -# FILE DRIVER = $(NAMED_GUID) { -# DXE_DEPEX DXE_DEPEX Optional $(INF_OUTPUT)/$(MODULE_NAME).depex -# COMPRESS PI_STD { -# GUIDED { -# PE32 PE32 $(INF_OUTPUT)/$(MODULE_NAME).efi -# UI STRING="$(MODULE_NAME)" Optional -# VERSION STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER) -# } -# } -# } -# -############################################################################

-[Rule.Common.SEC]

• FILE SEC = $(NAMED_GUID) RELOCS_STRIPPED {
• TE TE Align = 4K $(INF_OUTPUT)/$(MODULE_NAME).efi
• }

-[Rule.Common.PEI_CORE]

• FILE PEI_CORE = $(NAMED_GUID) {
• TE TE Align = Auto $(INF_OUTPUT)/$(MODULE_NAME).efi
• UI STRING ="$(MODULE_NAME)" Optional
• }

-[Rule.Common.PEIM]

• FILE PEIM = $(NAMED_GUID) {

• PEI_DEPEX PEI_DEPEX Optional       $(INF_OUTPUT)/$(MODULE_NAME).depex
  

• TE       TE Align = Auto           $(INF_OUTPUT)/$(MODULE_NAME).efi
  

• UI       STRING="$(MODULE_NAME)" Optional
  

• }

-[Rule.Common.PEIM.BINARY]

• FILE PEIM = $(NAMED_GUID) {

• PEI_DEPEX PEI_DEPEX Optional       $(INF_OUTPUT)/$(MODULE_NAME).depex
  

• TE       TE Align = Auto           |.efi
  

• UI       STRING="$(MODULE_NAME)" Optional
  

• }

-[Rule.Common.PEIM.TIANOCOMPRESSED]

• FILE PEIM = $(NAMED_GUID) DEBUG_MYTOOLS_IA32 {
• PEI_DEPEX PEI_DEPEX Optional $(INF_OUTPUT)/$(MODULE_NAME).depex
• GUIDED A31280AD-481E-41B6-95E8-127F4C984779 PROCESSING_REQUIRED = TRUE {

•  PE32      PE32                    $(INF_OUTPUT)/$(MODULE_NAME).efi
  

•  UI        STRING="$(MODULE_NAME)" Optional
  

• }
• }

-[Rule.Common.DXE_CORE]

• FILE DXE_CORE = $(NAMED_GUID) {
• PE32 PE32 $(INF_OUTPUT)/$(MODULE_NAME).efi
• UI STRING="$(MODULE_NAME)" Optional
• }

-[Rule.Common.UEFI_DRIVER]

• FILE DRIVER = $(NAMED_GUID) {
• DXE_DEPEX DXE_DEPEX Optional $(INF_OUTPUT)/$(MODULE_NAME).depex
• PE32 PE32 $(INF_OUTPUT)/$(MODULE_NAME).efi
• UI STRING="$(MODULE_NAME)" Optional
• }

-[Rule.Common.DXE_DRIVER]

• FILE DRIVER = $(NAMED_GUID) {
• DXE_DEPEX DXE_DEPEX Optional $(INF_OUTPUT)/$(MODULE_NAME).depex
• PE32 PE32 $(INF_OUTPUT)/$(MODULE_NAME).efi
• UI STRING="$(MODULE_NAME)" Optional
• }

-[Rule.Common.DXE_DRIVER.BINARY]

• FILE DRIVER = $(NAMED_GUID) {
• DXE_DEPEX DXE_DEPEX Optional |.depex
• PE32 PE32 |.efi
• UI STRING="$(MODULE_NAME)" Optional
• }

-[Rule.Common.DXE_RUNTIME_DRIVER]

• FILE DRIVER = $(NAMED_GUID) {
• DXE_DEPEX DXE_DEPEX Optional $(INF_OUTPUT)/$(MODULE_NAME).depex
• PE32 PE32 $(INF_OUTPUT)/$(MODULE_NAME).efi
• UI STRING="$(MODULE_NAME)" Optional
• }

-[Rule.Common.UEFI_APPLICATION]

• FILE APPLICATION = $(NAMED_GUID) {
• UI STRING ="$(MODULE_NAME)" Optional
• PE32 PE32 $(INF_OUTPUT)/$(MODULE_NAME).efi
• }

-[Rule.Common.UEFI_DRIVER.BINARY]

• FILE DRIVER = $(NAMED_GUID) {
• DXE_DEPEX DXE_DEPEX Optional |.depex
• PE32 PE32 |.efi
• UI STRING="$(MODULE_NAME)" Optional
• VERSION STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)
• }

-[Rule.Common.UEFI_APPLICATION.BINARY]

• FILE APPLICATION = $(NAMED_GUID) {
• PE32 PE32 |.efi
• UI STRING="$(MODULE_NAME)" Optional
• VERSION STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)
• }

-[Rule.Common.USER_DEFINED.ACPITABLE]

• FILE FREEFORM = $(NAMED_GUID) {
• RAW ACPI |.acpi
• RAW ASL |.aml
• }

diff --git a/Platforms/Hisilicon/D02/Pv660D02.dsc b/Platforms/Hisilicon/D02/Pv660D02.dsc index 2228e51..c000b26 100644 --- a/Platforms/Hisilicon/D02/Pv660D02.dsc +++ b/Platforms/Hisilicon/D02/Pv660D02.dsc @@ -30,7 +30,7 @@ FLASH_DEFINITION = OpenPlatformPkg/Platforms/Hisilicon/D02/$(PLATFORM_NAME).fdf DEFINE INCLUDE_TFTP_COMMAND=1 -!include OpenPlatformPkg/Chips/Hisilicon/Pv660/Pv660.dsc.inc +!include OpenPlatformPkg/Chips/Hisilicon/Hisilicon.dsc.inc [LibraryClasses.common] ArmLib|ArmPkg/Library/ArmLib/ArmBaseLib.inf diff --git a/Platforms/Hisilicon/D02/Pv660D02.fdf b/Platforms/Hisilicon/D02/Pv660D02.fdf index fa0dc2d..34f2368 100644 --- a/Platforms/Hisilicon/D02/Pv660D02.fdf +++ b/Platforms/Hisilicon/D02/Pv660D02.fdf @@ -320,5 +320,5 @@ READ_LOCK_STATUS = TRUE } -!include OpenPlatformPkg/Chips/Hisilicon/Pv660/Pv660.fdf.inc +!include OpenPlatformPkg/Chips/Hisilicon/Hisilicon.fdf.inc diff --git a/Platforms/Hisilicon/D03/D03.dsc b/Platforms/Hisilicon/D03/D03.dsc index 7c72c84..9c96952 100644 --- a/Platforms/Hisilicon/D03/D03.dsc +++ b/Platforms/Hisilicon/D03/D03.dsc @@ -30,7 +30,7 @@ FLASH_DEFINITION = OpenPlatformPkg/Platforms/Hisilicon/$(PLATFORM_NAME)/$(PLATFORM_NAME).fdf DEFINE INCLUDE_TFTP_COMMAND=1 -!include OpenPlatformPkg/Chips/Hisilicon/Pv660/Pv660.dsc.inc +!include OpenPlatformPkg/Chips/Hisilicon/Hisilicon.dsc.inc [LibraryClasses.common] ArmLib|ArmPkg/Library/ArmLib/ArmBaseLib.inf diff --git a/Platforms/Hisilicon/D03/D03.fdf b/Platforms/Hisilicon/D03/D03.fdf index 8ba3bd0..d4a0049 100644 --- a/Platforms/Hisilicon/D03/D03.fdf +++ b/Platforms/Hisilicon/D03/D03.fdf @@ -338,5 +338,5 @@ READ_LOCK_STATUS = TRUE } -!include OpenPlatformPkg/Chips/Hisilicon/Pv660/Pv660.fdf.inc +!include OpenPlatformPkg/Chips/Hisilicon/Hisilicon.fdf.inc -- 1.9.1