From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from cam-smtp0.cambridge.arm.com (fw-tnat.cambridge.arm.com [217.140.96.140]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 0444F20958BDC for ; Fri, 1 Sep 2017 10:24:50 -0700 (PDT) Received: from E111747.Emea.Arm.com (e111747.emea.arm.com [10.1.25.113]) by cam-smtp0.cambridge.arm.com (8.13.8/8.13.8) with ESMTP id v81HRXrF016868; Fri, 1 Sep 2017 18:27:33 +0100 From: evan.lloyd@arm.com To: edk2-devel@lists.01.org Cc: Ard Biesheuvel , Leif Lindholm , Matteo Carlini , Ryan Harkin Date: Fri, 1 Sep 2017 18:27:28 +0100 Message-Id: <20170901172728.10480-1-evan.lloyd@arm.com> X-Mailer: git-send-email 2.14.1 Subject: [PATCH] Platform/ARM/VExpressPkg:Fix Pcd broken in edk2 X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 01 Sep 2017 17:24:51 -0000 From: EvanLloyd A recent change in edk2: EmbeddedPkg/EmbeddedPkg.dsc: fix build for non-ARM architectures actually broke the build for AARCH64 architectures (well Juno, really). The PCD moved, PcdIsp1761BaseAddress, is used by edk2\EmbeddedPkg\Drivers\Isp1761UsbDxe\Isp1761UsbDxe.inf, which was included by Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc This patch moves the Isp1761UsbDxe.inf to [Components.ARM] so that it doesn't invoke the PCD for Juno. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Evan Lloyd --- Code may be examined at: https://github.com/EvanLloyd/edk2-platforms/blob/148_fix_juno_build_v1/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc b/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc index 770007d1c89300f11c130515244686db6f97c96b..f82df48a00b22967f9c9741526fc0c1b75073fa0 100644 --- a/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc +++ b/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc @@ -471,9 +471,6 @@ [Components.common] EmbeddedPkg/Drivers/Lan91xDxe/Lan91xDxe.inf !endif - # ISP1761 USB OTG Controller - EmbeddedPkg/Drivers/Isp1761UsbDxe/Isp1761UsbDxe.inf - # # Android Fastboot # @@ -505,3 +502,9 @@ [Components.common] PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf BcfgCommandLib|ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcfgCommandLib.inf } + +[Components.ARM] + + # ISP1761 USB OTG Controller + EmbeddedPkg/Drivers/Isp1761UsbDxe/Isp1761UsbDxe.inf + -- Guid("CE165669-3EF3-493F-B85D-6190EE5B9759")