From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=40.107.5.61; helo=eur03-ve1-obe.outbound.protection.outlook.com; envelope-from=vabhav.sharma@nxp.com; receiver=edk2-devel@lists.01.org Received: from EUR03-VE1-obe.outbound.protection.outlook.com (mail-eopbgr50061.outbound.protection.outlook.com [40.107.5.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 35EB42041B29D for ; Tue, 24 Apr 2018 05:47:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=mY0gRgjDQPR+4x4gvkkQSLM+IJ3eSekEpgUnzO5JEno=; b=u+jxuutZgHmgwby9dvG/dp2y9YKej6k8iOAQ0Ymau6zclTR+ejoUhzT/YhTHt6L4hsuLpTZYJDHSCpWKkhvC5OmlKt9CIiDCrxb52Oxo09qJH5XrUTXuYGwFfZG977qR1WJSh5g+vP3CLp1pUNtwNfyCRg6b2MIiMvIhDd36A6E= Received: from DB4PR04MB299.eurprd04.prod.outlook.com (10.141.239.21) by DB4PR04MB508.eurprd04.prod.outlook.com (10.141.239.156) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.696.15; Tue, 24 Apr 2018 12:47:34 +0000 Received: from DB4PR04MB299.eurprd04.prod.outlook.com ([fe80::2dcd:1bc7:8d4e:5dc2]) by DB4PR04MB299.eurprd04.prod.outlook.com ([fe80::2dcd:1bc7:8d4e:5dc2%15]) with mapi id 15.20.0696.017; Tue, 24 Apr 2018 12:47:33 +0000 From: Vabhav Sharma To: Leif Lindholm , Meenakshi Aggarwal CC: "ard.biesheuvel@linaro.org" , "edk2-devel@lists.01.org" , Udit Kumar , Varun Sethi Thread-Topic: [PATCH edk2-platforms 35/39] Compilation: Update the fdf, dsc and dec files. Thread-Index: AQHTpwPcRtWYKoXbMkieJ5EexafzC6QKKN+AgAYb5zA= Date: Tue, 24 Apr 2018 12:47:33 +0000 Message-ID: References: <1518771035-6733-1-git-send-email-meenakshi.aggarwal@nxp.com> <1518771035-6733-36-git-send-email-meenakshi.aggarwal@nxp.com> <20180420152253.zsy4aacsg6q645iq@bivouac.eciton.net> In-Reply-To: <20180420152253.zsy4aacsg6q645iq@bivouac.eciton.net> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: spf=none (sender IP is ) smtp.mailfrom=vabhav.sharma@nxp.com; x-originating-ip: [14.142.187.166] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; DB4PR04MB508; 7:SIulgXAGL93uxNF23kk+2aarqDdWFQc9lkvYDfOBBkRcUPSniuTZGjW1pMspHdaYVeZFk10Gtj8sTNru3NSEpSJP1aUQ4kDlsuMpQ5mFWpIfbZedwW7rV+xGocu0nuz51Yy2vpx7OKOInl9MCsduSQcpocgdUSQucShKSHHMUFFkiX/PaCwW+U5dgtxUgfnfQ4cYOyuUV3/DAYfMbKhqDut4pTJuSWbCcN9RTINn5Gcw7lBmDsevHGoyDw5ZqOuX x-ms-exchange-antispam-srfa-diagnostics: SOS; x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4534165)(7168020)(4627221)(201703031133081)(201702281549075)(48565401081)(2017052603328)(7153060)(7193020); SRVR:DB4PR04MB508; x-ms-traffictypediagnostic: DB4PR04MB508: x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(185117386973197)(162533806227266)(17755550239193); x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(3002001)(3231232)(944501410)(52105095)(93006095)(93001095)(10201501046)(6055026)(6041310)(20161123564045)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(20161123560045)(6072148)(201708071742011); SRVR:DB4PR04MB508; BCL:0; PCL:0; RULEID:; SRVR:DB4PR04MB508; x-forefront-prvs: 0652EA5565 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(39860400002)(39380400002)(346002)(366004)(376002)(396003)(13464003)(199004)(189003)(476003)(446003)(11346002)(3660700001)(486006)(478600001)(4326008)(6246003)(25786009)(74316002)(2900100001)(14454004)(7736002)(6436002)(316002)(5250100002)(8676002)(54906003)(81166006)(81156014)(86362001)(110136005)(15650500001)(2906002)(3846002)(6116002)(55016002)(53936002)(9686003)(44832011)(26005)(59450400001)(186003)(5660300001)(76176011)(229853002)(99286004)(106356001)(7696005)(33656002)(8936002)(105586002)(102836004)(68736007)(66066001)(6636002)(6506007)(55236004)(305945005)(97736004)(3280700002)(19627235001); DIR:OUT; SFP:1101; SCL:1; SRVR:DB4PR04MB508; H:DB4PR04MB299.eurprd04.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; received-spf: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) x-microsoft-antispam-message-info: JC99ymvwa2w+XQjXegiYeF+G6ntr/2J92KxVKOn0eUeRDQkoGnC/svfIVjCYxBANZGKIgVndhWqbBoZYpQ/Rnfstvy5v2Z9UvyADVhBM02BqJypUzkZK4wxYTkdjKS/RaZCm+qAvgsFpUMxcWbIn2+s4P9zdO9gIWueCSgV/d8ARPkmcau9k3b/BHEkpV+cX spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: 09f9353a-8ca4-46cd-13a0-08d5a9e18cd2 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 09f9353a-8ca4-46cd-13a0-08d5a9e18cd2 X-MS-Exchange-CrossTenant-originalarrivaltime: 24 Apr 2018 12:47:33.6544 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB4PR04MB508 Subject: Re: [PATCH edk2-platforms 35/39] Compilation: Update the fdf, dsc and dec files. X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 24 Apr 2018 12:47:38 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable >-----Original Message----- >From: Leif Lindholm [mailto:leif.lindholm@linaro.org] >Sent: Friday, April 20, 2018 8:53 PM >To: Meenakshi Aggarwal >Cc: ard.biesheuvel@linaro.org; edk2-devel@lists.01.org; Udit Kumar >; Varun Sethi ; Vabhav Sharma > >Subject: Re: [PATCH edk2-platforms 35/39] Compilation: Update the fdf, dsc= and >dec files. > >On Fri, Feb 16, 2018 at 02:20:31PM +0530, Meenakshi wrote: >> From: Meenakshi Aggarwal >> >> LS1043A PCIe compilation and update firmware device, description and >> declaration files.Defining Embedded Package PCD which should be at >> least 20 for 64K PCIe IO size required for CPU hob during PEI phase to >> Add IO space post PEI phase. >> >> Contributed-under: TianoCore Contribution Agreement 1.1 >> Signed-off-by: Vabhav >> Signed-off-by: Meenakshi Aggarwal >> --- >> Platform/NXP/LS1043aRdbPkg/LS1043aRdbPkg.dsc | 16 >++++++++++++++++ >> Platform/NXP/LS1043aRdbPkg/LS1043aRdbPkg.fdf | 9 +++++++++ >> .../LS1043aRdbPkg/Library/PlatformLib/ArmPlatformLib.inf | 2 ++ >> .../LS1043aRdbPkg/Library/PlatformLib/NxpQoriqLsMem.c | 6 ++++++ >> Platform/NXP/NxpQoriqLs.dsc | 7 +++++++ >> Silicon/NXP/LS1043A/LS1043A.dsc | 4 ++++ >> Silicon/NXP/NxpQoriqLs.dec | 10 +++++++++= + >> 7 files changed, 54 insertions(+) >> >> diff --git a/Platform/NXP/LS1043aRdbPkg/LS1043aRdbPkg.dsc >> b/Platform/NXP/LS1043aRdbPkg/LS1043aRdbPkg.dsc >> index b2b514e..8cbaf88 100644 >> --- a/Platform/NXP/LS1043aRdbPkg/LS1043aRdbPkg.dsc >> +++ b/Platform/NXP/LS1043aRdbPkg/LS1043aRdbPkg.dsc >> @@ -42,6 +42,8 @@ >> BoardLib|Platform/NXP/LS1043aRdbPkg/Library/BoardLib/BoardLib.inf >> FpgaLib|Platform/NXP/LS1043aRdbPkg/Library/FpgaLib/FpgaLib.inf >> NorFlashLib|Silicon/NXP/Library/NorFlashLib/NorFlashLib.inf >> + PciSegmentLib|Silicon/NXP/Library/PciSegmentLib/PciSegmentLib.inf >> + >> + PciHostBridgeLib|Silicon/NXP/Library/PciHostBridgeLib/PciHostBridgeL >> + ib.inf >> >> [PcdsFixedAtBuild.common] >> >> @@ -79,6 +81,13 @@ >> gNxpQoriqLsTokenSpaceGuid.PcdFlashDeviceBase64|0x060000000 >> gNxpQoriqLsTokenSpaceGuid.PcdFlashReservedRegionBase64|0x60300000 >> >> + # >> + # PCI PCDs. >> + # >> + gNxpQoriqLsTokenSpaceGuid.PcdPciDebug|FALSE >> + gNxpQoriqLsTokenSpaceGuid.PcdPcieLutBase|0x10000 >> + gNxpQoriqLsTokenSpaceGuid.PcdPcieLutDbg|0x7FC >> + >> >> >################################################################## >#### >> ########## >> # >> # Components Section - list of all EDK II Modules needed by this >> Platform @@ -99,4 +108,11 @@ >> Silicon/NXP/Drivers/I2cDxe/I2cDxe.inf >> Silicon/NXP/Drivers/NorFlashDxe/NorFlashDxe.inf >> >> + Silicon/NXP/Drivers/PciCpuIo2Dxe/PciCpuIo2Dxe.inf >> + MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridgeDxe.inf { >> + >> + gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8010004F >> + } >> + MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf >> + >> ## >> diff --git a/Platform/NXP/LS1043aRdbPkg/LS1043aRdbPkg.fdf >> b/Platform/NXP/LS1043aRdbPkg/LS1043aRdbPkg.fdf >> index 6b5b63f..7993bf1 100644 >> --- a/Platform/NXP/LS1043aRdbPkg/LS1043aRdbPkg.fdf >> +++ b/Platform/NXP/LS1043aRdbPkg/LS1043aRdbPkg.fdf >> @@ -130,6 +130,13 @@ READ_LOCK_STATUS =3D TRUE >> INF Silicon/NXP/Drivers/NorFlashDxe/NorFlashDxe.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 >> @@ -154,6 +161,8 @@ READ_LOCK_STATUS =3D TRUE >> INF MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf >> !endif >> >> + INF >> + >ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf >> + > >I'm pretty OK with most of these random updates squashed into one file, bu= t the >TftpDynamicCommand is something I generally don't like to see included by >default. > >Other platforms put this inside a conditional statement: > >!ifdef $(INCLUDE_TFTP_COMMAND) > INF >ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf >!endif > >so that it can be included when -D INCLUDE_TFTP_COMMAND=3D1 is added to th= e >build command line. > >But beyond that, there is no mention of this addition in the commit messag= e. So >please add a notice, or break this specific item out as a separate patch. Alright agree, I will update for conditional inclusion and submit as separa= te patch. > >> # >> # FAT filesystem + GPT/MBR partitioning >> # >> diff --git >> a/Platform/NXP/LS1043aRdbPkg/Library/PlatformLib/ArmPlatformLib.inf >> b/Platform/NXP/LS1043aRdbPkg/Library/PlatformLib/ArmPlatformLib.inf >> index 7feac56..f2c8b66 100644 >> --- >> a/Platform/NXP/LS1043aRdbPkg/Library/PlatformLib/ArmPlatformLib.inf >> +++ b/Platform/NXP/LS1043aRdbPkg/Library/PlatformLib/ArmPlatformLib.in >> +++ f >> @@ -65,3 +65,5 @@ >> gNxpQoriqLsTokenSpaceGuid.PcdDram3Size >> gNxpQoriqLsTokenSpaceGuid.PcdQspiRegionBaseAddr >> gNxpQoriqLsTokenSpaceGuid.PcdQspiRegionSize >> + gNxpQoriqLsTokenSpaceGuid.PcdRomBaseAddr >> + gNxpQoriqLsTokenSpaceGuid.PcdRomSize >> diff --git >> a/Platform/NXP/LS1043aRdbPkg/Library/PlatformLib/NxpQoriqLsMem.c >> b/Platform/NXP/LS1043aRdbPkg/Library/PlatformLib/NxpQoriqLsMem.c >> index 64c5612..1ef3292 100644 >> --- a/Platform/NXP/LS1043aRdbPkg/Library/PlatformLib/NxpQoriqLsMem.c >> +++ b/Platform/NXP/LS1043aRdbPkg/Library/PlatformLib/NxpQoriqLsMem.c >> @@ -67,6 +67,12 @@ ArmPlatformGetVirtualMemoryMap ( >> VirtualMemoryTable[Index].Length =3D FixedPcdGet64 (PcdCcsrSize= ); >> VirtualMemoryTable[Index].Attributes =3D >ARM_MEMORY_REGION_ATTRIBUTE_DEVICE; >> >> + // ROM Space >> + VirtualMemoryTable[++Index].PhysicalBase =3D FixedPcdGet64 >> + (PcdRomBaseAddr); VirtualMemoryTable[Index].VirtualBase =3D >FixedPcdGet64 (PcdRomBaseAddr); >> + VirtualMemoryTable[Index].Length =3D FixedPcdGet64 (PcdRomSize)= ; >> + VirtualMemoryTable[Index].Attributes =3D >ARM_MEMORY_REGION_ATTRIBUTE_DEVICE; >> + >> // IFC region 1 >> // >> // A-009241 : Unaligned write transactions to IFC may result in cor= ruption of >data >> diff --git a/Platform/NXP/NxpQoriqLs.dsc b/Platform/NXP/NxpQoriqLs.dsc >> index 5987cd6..f5bb2e9 100644 >> --- a/Platform/NXP/NxpQoriqLs.dsc >> +++ b/Platform/NXP/NxpQoriqLs.dsc >> @@ -244,6 +244,8 @@ >> >> gEfiMdePkgTokenSpaceGuid.PcdReportStatusCodePropertyMask|0x07 >> >> + gEmbeddedTokenSpaceGuid.PcdPrePiCpuIoSize|20 >> + >> # >> # Optional feature to help prevent EFI memory map fragments >> # Turned on and off via: PcdPrePiProduceMemoryTypeInformationHob >> @@ -409,4 +411,9 @@ >> !endif #$(NO_SHELL_PROFILES) >> } >> >> + # >> + # TFTP Shell Command >> + # >> + >ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf >> + > >Same comment, conditional? > >/ > Leif > Ok, Sure. >> ## >> diff --git a/Silicon/NXP/LS1043A/LS1043A.dsc >> b/Silicon/NXP/LS1043A/LS1043A.dsc index a4eb117..f3220fa 100644 >> --- a/Silicon/NXP/LS1043A/LS1043A.dsc >> +++ b/Silicon/NXP/LS1043A/LS1043A.dsc >> @@ -64,6 +64,9 @@ >> gNxpQoriqLsTokenSpaceGuid.PcdQspiRegionBaseAddr|0x40000000 >> gNxpQoriqLsTokenSpaceGuid.PcdQspiRegionSize|0x20000000 >> gNxpQoriqLsTokenSpaceGuid.PcdIfcBaseAddr|0x1530000 >> + gNxpQoriqLsTokenSpaceGuid.PcdNumPciController|3 >> + gNxpQoriqLsTokenSpaceGuid.PcdRomBaseAddr|0x00000000 >> + gNxpQoriqLsTokenSpaceGuid.PcdRomSize|0x00100000 >> >> # >> # Big Endian IPs >> @@ -71,5 +74,6 @@ >> gNxpQoriqLsTokenSpaceGuid.PcdGurBigEndian|TRUE >> gNxpQoriqLsTokenSpaceGuid.PcdWdogBigEndian|TRUE >> gNxpQoriqLsTokenSpaceGuid.PcdIfcBigEndian|TRUE >> + gNxpQoriqLsTokenSpaceGuid.PcdPciLutBigEndian|TRUE >> >> ## >> diff --git a/Silicon/NXP/NxpQoriqLs.dec b/Silicon/NXP/NxpQoriqLs.dec >> index 3cb476d..a3508b5 100644 >> --- a/Silicon/NXP/NxpQoriqLs.dec >> +++ b/Silicon/NXP/NxpQoriqLs.dec >> @@ -79,6 +79,16 @@ >> gNxpQoriqLsTokenSpaceGuid.PcdCcsrSize|0x0|UINT64|0x00000129 >> gNxpQoriqLsTokenSpaceGuid.PcdDramMemSize|0x0|UINT64|0x0000012A >> gNxpQoriqLsTokenSpaceGuid.PcdIfcBaseAddr|0x0|UINT64|0x0000012B >> + gNxpQoriqLsTokenSpaceGuid.PcdRomBaseAddr|0x0|UINT64|0x0000012C >> + gNxpQoriqLsTokenSpaceGuid.PcdRomSize|0x0|UINT64|0x0000012D >> + >> + # >> + # PCI PCDs >> + # >> + gNxpQoriqLsTokenSpaceGuid.PcdPcieLutBase|0x0|UINT32|0x000001D0 >> + gNxpQoriqLsTokenSpaceGuid.PcdPcieLutDbg|0x0|UINT32|0x000001D1 >> + gNxpQoriqLsTokenSpaceGuid.PcdPciDebug|FALSE|BOOLEAN|0x000001D2 >> + gNxpQoriqLsTokenSpaceGuid.PcdNumPciController|0|UINT32|0x000001D3 >> >> # >> # IFC PCDs >> -- >> 1.9.1 >>