From: EvanLloyd <[email protected]>

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 <[email protected]>
---

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")

_______________________________________________
edk2-devel mailing list
[email protected]
https://lists.01.org/mailman/listinfo/edk2-devel

Reply via email to