On Wed, Nov 28, 2018 at 08:31:54PM +0530, Meenakshi Aggarwal wrote:
> From: Vabhav <vabhav.sha...@nxp.com>
>
> Compilation: Update the fdf, dsc and dec files.
The diffstat below tells me that. The commit message is supposed to
tell me what is changed, and why.
/
Leif
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Vabhav <vabhav.sha...@nxp.com>
> Signed-off-by: Meenakshi Aggarwal <meenakshi.aggar...@nxp.com>
> ---
> Platform/NXP/LS1046aRdbPkg/LS1046aRdbPkg.dsc | 15
> +++++++++++++++
> Platform/NXP/LS1046aRdbPkg/LS1046aRdbPkg.fdf | 7 +++++++
> .../LS1046aRdbPkg/Library/PlatformLib/ArmPlatformLib.inf | 2 ++
> .../NXP/LS1046aRdbPkg/Library/PlatformLib/NxpQoriqLsMem.c | 6 ++++++
> Silicon/NXP/LS1046A/LS1046A.dsc.inc | 3 +++
> 5 files changed, 33 insertions(+)
>
> diff --git a/Platform/NXP/LS1046aRdbPkg/LS1046aRdbPkg.dsc
> b/Platform/NXP/LS1046aRdbPkg/LS1046aRdbPkg.dsc
> index 7eb08a9..57f2043 100644
> --- a/Platform/NXP/LS1046aRdbPkg/LS1046aRdbPkg.dsc
> +++ b/Platform/NXP/LS1046aRdbPkg/LS1046aRdbPkg.dsc
> @@ -41,6 +41,8 @@
> IfcLib|Silicon/NXP/Library/IfcLib/IfcLib.inf
> BoardLib|Platform/NXP/LS1046aRdbPkg/Library/BoardLib/BoardLib.inf
> FpgaLib|Silicon/NXP/Library/FpgaLib/FpgaLib.inf
> + PciSegmentLib|Silicon/NXP/Library/PciSegmentLib/PciSegmentLib.inf
> + PciHostBridgeLib|Silicon/NXP/Library/PciHostBridgeLib/PciHostBridgeLib.inf
>
> [PcdsFixedAtBuild.common]
>
> @@ -65,6 +67,7 @@
> gNxpQoriqLsTokenSpaceGuid.PcdGurBigEndian|TRUE
> gNxpQoriqLsTokenSpaceGuid.PcdWdogBigEndian|TRUE
> gNxpQoriqLsTokenSpaceGuid.PcdIfcBigEndian|TRUE
> + gNxpQoriqLsTokenSpaceGuid.PcdPciLutBigEndian|TRUE
>
> #
> # RTC Pcds
> @@ -72,6 +75,12 @@
> gPcf2129RtcLibTokenSpaceGuid.PcdI2cSlaveAddress|0x51
> gPcf2129RtcLibTokenSpaceGuid.PcdI2cBusFrequency|100000
>
> + #
> + # PCI PCDs.
> + #
> + gNxpQoriqLsTokenSpaceGuid.PcdPciDebug|FALSE
> + gNxpQoriqLsTokenSpaceGuid.PcdPcieLutBase|0x80000
> + gNxpQoriqLsTokenSpaceGuid.PcdPcieLutDbg|0x407FC
>
> ################################################################################
> #
> # Components Section - list of all EDK II Modules needed by this Platform
> @@ -85,6 +94,12 @@
>
> Silicon/NXP/Drivers/WatchDog/WatchDogDxe.inf
> Silicon/NXP/Drivers/I2cDxe/I2cDxe.inf
> + Silicon/NXP/Drivers/PciCpuIo2Dxe/PciCpuIo2Dxe.inf
> + MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridgeDxe.inf {
> + <PcdsFixedAtBuild>
> + gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8010004F
> + }
> + MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf
>
> Platform/NXP/LS1046aRdbPkg/Drivers/PlatformDxe/PlatformDxe.inf
> ##
> diff --git a/Platform/NXP/LS1046aRdbPkg/LS1046aRdbPkg.fdf
> b/Platform/NXP/LS1046aRdbPkg/LS1046aRdbPkg.fdf
> index 443b561..887f386 100644
> --- a/Platform/NXP/LS1046aRdbPkg/LS1046aRdbPkg.fdf
> +++ b/Platform/NXP/LS1046aRdbPkg/LS1046aRdbPkg.fdf
> @@ -124,6 +124,13 @@ READ_LOCK_STATUS = TRUE
> INF EmbeddedPkg/SimpleTextInOutSerial/SimpleTextInOutSerial.inf
>
> #
> + # PCI
> + #
> + INF Silicon/NXP/Drivers/PciCpuIo2Dxe/PciCpuIo2Dxe.inf
> + INF MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridgeDxe.inf
> + INF MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf
> +
> + #
> # Network modules
> #
> INF MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf
> diff --git
> a/Platform/NXP/LS1046aRdbPkg/Library/PlatformLib/ArmPlatformLib.inf
> b/Platform/NXP/LS1046aRdbPkg/Library/PlatformLib/ArmPlatformLib.inf
> index 49b57fc..5e09757 100644
> --- a/Platform/NXP/LS1046aRdbPkg/Library/PlatformLib/ArmPlatformLib.inf
> +++ b/Platform/NXP/LS1046aRdbPkg/Library/PlatformLib/ArmPlatformLib.inf
> @@ -42,6 +42,8 @@
> gArmTokenSpaceGuid.PcdArmPrimaryCore
> gNxpQoriqLsTokenSpaceGuid.PcdCcsrBaseAddr
> gNxpQoriqLsTokenSpaceGuid.PcdCcsrSize
> + gNxpQoriqLsTokenSpaceGuid.PcdRomBaseAddr
> + gNxpQoriqLsTokenSpaceGuid.PcdRomSize
> gNxpQoriqLsTokenSpaceGuid.PcdIfcRegion1BaseAddr
> gNxpQoriqLsTokenSpaceGuid.PcdIfcRegion1Size
> gNxpQoriqLsTokenSpaceGuid.PcdIfcRegion2BaseAddr
> diff --git a/Platform/NXP/LS1046aRdbPkg/Library/PlatformLib/NxpQoriqLsMem.c
> b/Platform/NXP/LS1046aRdbPkg/Library/PlatformLib/NxpQoriqLsMem.c
> index 64c5612..1ef3292 100644
> --- a/Platform/NXP/LS1046aRdbPkg/Library/PlatformLib/NxpQoriqLsMem.c
> +++ b/Platform/NXP/LS1046aRdbPkg/Library/PlatformLib/NxpQoriqLsMem.c
> @@ -67,6 +67,12 @@ ArmPlatformGetVirtualMemoryMap (
> VirtualMemoryTable[Index].Length = FixedPcdGet64 (PcdCcsrSize);
> VirtualMemoryTable[Index].Attributes =
> ARM_MEMORY_REGION_ATTRIBUTE_DEVICE;
>
> + // ROM Space
> + VirtualMemoryTable[++Index].PhysicalBase = FixedPcdGet64 (PcdRomBaseAddr);
> + VirtualMemoryTable[Index].VirtualBase = FixedPcdGet64 (PcdRomBaseAddr);
> + VirtualMemoryTable[Index].Length = FixedPcdGet64 (PcdRomSize);
> + VirtualMemoryTable[Index].Attributes =
> ARM_MEMORY_REGION_ATTRIBUTE_DEVICE;
> +
> // IFC region 1
> //
> // A-009241 : Unaligned write transactions to IFC may result in
> corruption of data
> diff --git a/Silicon/NXP/LS1046A/LS1046A.dsc.inc
> b/Silicon/NXP/LS1046A/LS1046A.dsc.inc
> index 9f87028..59a6150 100644
> --- a/Silicon/NXP/LS1046A/LS1046A.dsc.inc
> +++ b/Silicon/NXP/LS1046A/LS1046A.dsc.inc
> @@ -64,5 +64,8 @@
> gNxpQoriqLsTokenSpaceGuid.PcdQspiRegionBaseAddr|0x40000000
> gNxpQoriqLsTokenSpaceGuid.PcdQspiRegionSize|0x20000000
> gNxpQoriqLsTokenSpaceGuid.PcdIfcBaseAddr|0x1530000
> + gNxpQoriqLsTokenSpaceGuid.PcdNumPciController|3
> + gNxpQoriqLsTokenSpaceGuid.PcdRomBaseAddr|0x00000000
> + gNxpQoriqLsTokenSpaceGuid.PcdRomSize|0x00100000
>
> ##
> --
> 1.9.1
>
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
