1. Patchew
  2. EDK2
  3. View series

[edk2] [PATCH] Platform/ARM/VExpressPkg:Fix Pcd broken in edk2

evan.lloyd@arm.com posted 1 patch 6 years, 7 months ago
Failed in applying to current master (apply log)
Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
[edk2] [PATCH] Platform/ARM/VExpressPkg:Fix Pcd broken in edk2
Posted by evan.lloyd@arm.com 6 years, 7 months ago 
From: EvanLloyd <evan.lloyd@arm.com>

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 <evan.lloyd@arm.com>
---

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
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
Re: [edk2] [PATCH] Platform/ARM/VExpressPkg:Fix Pcd broken in edk2
Posted by Jeremy Linton 6 years, 7 months ago 
Hi,

It seems the FVP is build is broken too (and this appears to be part of the solution).


|-----Original Message-----
|From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of
|evan.lloyd@arm.com
|Sent: Friday, September 01, 2017 12:27 PM
|To: edk2-devel@lists.01.org
|Cc: ryan.harkin@linaro.org; Leif Lindholm; Ard Biesheuvel
|Subject: [edk2] [PATCH] Platform/ARM/VExpressPkg:Fix Pcd broken in edk2
|
|From: EvanLloyd <evan.lloyd@arm.com>
|
|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 <evan.lloyd@arm.com>
|---
|
|Code may be examined at:
|https://github.com/EvanLloyd/edk2-
|platforms/blob/148_fix_juno_build_v1/Platform/ARM/VExpressPkg/ArmVEx
|press.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..f82df48a00b22967f9c9741526fc
|0c1b75073fa0 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/UefiShellBcfg
|CommandLib.inf
|   }
|+
|+[Components.ARM]
|+
|+  # ISP1761 USB OTG Controller
|+  EmbeddedPkg/Drivers/Isp1761UsbDxe/Isp1761UsbDxe.inf
|+
|--
|Guid("CE165669-3EF3-493F-B85D-6190EE5B9759")
|
|_______________________________________________
|edk2-devel mailing list
|edk2-devel@lists.01.org
|https://lists.01.org/mailman/listinfo/edk2-devel
IMPORTANT NOTICE: The contents of this email and any attachments are confidential and may also be privileged. If you are not the intended recipient, please notify the sender immediately and do not disclose the contents to any other person, use it for any purpose, or store or copy the information in any medium. Thank you.
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
Re: [edk2] [PATCH] Platform/ARM/VExpressPkg:Fix Pcd broken in edk2
Posted by Leif Lindholm 6 years, 7 months ago 
On Fri, Sep 01, 2017 at 06:27:28PM +0100, evan.lloyd@arm.com wrote:
> From: EvanLloyd <evan.lloyd@arm.com>
> 
> 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.

Err, oops.

The only explanation I can think of is that in a moment of genius I
decided that since TC2 was the only platform using the driver, that
was the only one I had to build test after the change...

> Contributed-under: TianoCore Contribution Agreement 1.0
> Signed-off-by: Evan Lloyd <evan.lloyd@arm.com>

Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>

However, would you be able to submit this under Contribution Agreement
1.1? (a reply stating so would be sufficient, I can fold it in before
pushing)

/
    Leif

> ---
> 
> 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
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
Re: [edk2] [PATCH] Platform/ARM/VExpressPkg:Fix Pcd broken in edk2
Posted by Evan Lloyd 6 years, 7 months ago 
Thanks, Leif.

> -----Original Message-----
> From: Leif Lindholm [mailto:leif.lindholm@linaro.org]
> Sent: 01 September 2017 22:48
> To: Evan Lloyd <Evan.Lloyd@arm.com>
> Cc: edk2-devel@lists.01.org; Ard Biesheuvel <ard.biesheuvel@linaro.org>;
> Matteo Carlini <Matteo.Carlini@arm.com>; ryan.harkin@linaro.org
> Subject: Re: [PATCH] Platform/ARM/VExpressPkg:Fix Pcd broken in edk2
>
> On Fri, Sep 01, 2017 at 06:27:28PM +0100, evan.lloyd@arm.com wrote:
> > From: EvanLloyd <evan.lloyd@arm.com>
> >
> > 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.
>
> Err, oops.
>
> The only explanation I can think of is that in a moment of genius I decided
> that since TC2 was the only platform using the driver, that was the only one I
> had to build test after the change...

[[Evan Lloyd]] Big of you to own up.  We've all been there.

>
> > Contributed-under: TianoCore Contribution Agreement 1.0
> > Signed-off-by: Evan Lloyd <evan.lloyd@arm.com>
>
> Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>
>
> However, would you be able to submit this under Contribution Agreement
> 1.1? (a reply stating so would be sufficient, I can fold it in before
> pushing)

[[Evan Lloyd]]
[[Evan Lloyd]] "Err, oops."  Please be so good as to accept this assurance that I intended to use Contribution Agreement 1.1.  I'll change our template today, to prevent this happening again.

>
> /
>     Leif
>
> > ---
> >
> > 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..f82df48a00b22967f9c974152
> 6fc
> > 0c1b75073fa0 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/UefiShellBcfgC
> ommandLib.inf
> >    }
> > +
> > +[Components.ARM]
> > +
> > +  # ISP1761 USB OTG Controller
> > +  EmbeddedPkg/Drivers/Isp1761UsbDxe/Isp1761UsbDxe.inf
> > +
> > --
> > Guid("CE165669-3EF3-493F-B85D-6190EE5B9759")
> >
IMPORTANT NOTICE: The contents of this email and any attachments are confidential and may also be privileged. If you are not the intended recipient, please notify the sender immediately and do not disclose the contents to any other person, use it for any purpose, or store or copy the information in any medium. Thank you.
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
Re: [edk2] [PATCH] Platform/ARM/VExpressPkg:Fix Pcd broken in edk2
Posted by Leif Lindholm 6 years, 7 months ago 
On Mon, Sep 04, 2017 at 03:03:42PM +0000, Evan Lloyd wrote:
> Thanks, Leif.
> 
> > -----Original Message-----
> > From: Leif Lindholm [mailto:leif.lindholm@linaro.org]
> > Sent: 01 September 2017 22:48
> > To: Evan Lloyd <Evan.Lloyd@arm.com>
> > Cc: edk2-devel@lists.01.org; Ard Biesheuvel <ard.biesheuvel@linaro.org>;
> > Matteo Carlini <Matteo.Carlini@arm.com>; ryan.harkin@linaro.org
> > Subject: Re: [PATCH] Platform/ARM/VExpressPkg:Fix Pcd broken in edk2
> >
> > On Fri, Sep 01, 2017 at 06:27:28PM +0100, evan.lloyd@arm.com wrote:
> > > From: EvanLloyd <evan.lloyd@arm.com>
> > >
> > > 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.
> >
> > Err, oops.
> >
> > The only explanation I can think of is that in a moment of genius I decided
> > that since TC2 was the only platform using the driver, that was the only one I
> > had to build test after the change...
> 
> [[Evan Lloyd]] Big of you to own up.  We've all been there.

Well, it's out there for everyone to see whether I own up or not :)

> > > Contributed-under: TianoCore Contribution Agreement 1.0
> > > Signed-off-by: Evan Lloyd <evan.lloyd@arm.com>
> >
> > Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>
> >
> > However, would you be able to submit this under Contribution Agreement
> > 1.1? (a reply stating so would be sufficient, I can fold it in before
> > pushing)
> 
> [[Evan Lloyd]]
> [[Evan Lloyd]] "Err, oops."  Please be so good as to accept this
> assurance that I intended to use Contribution Agreement 1.1.  I'll
> change our template today, to prevent this happening again.

Thanks - folded that change in and pushed as 6b95ac45c.
(After test-building _everything_.)

/
    Leif


> >
> > /
> >     Leif
> >
> > > ---
> > >
> > > 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..f82df48a00b22967f9c974152
> > 6fc
> > > 0c1b75073fa0 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/UefiShellBcfgC
> > ommandLib.inf
> > >    }
> > > +
> > > +[Components.ARM]
> > > +
> > > +  # ISP1761 USB OTG Controller
> > > +  EmbeddedPkg/Drivers/Isp1761UsbDxe/Isp1761UsbDxe.inf
> > > +
> > > --
> > > Guid("CE165669-3EF3-493F-B85D-6190EE5B9759")
> > >
> IMPORTANT NOTICE: The contents of this email and any attachments are confidential and may also be privileged. If you are not the intended recipient, please notify the sender immediately and do not disclose the contents to any other person, use it for any purpose, or store or copy the information in any medium. Thank you.
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

Patchew 2.1-devel-0870f84

© 2016 - 2024 Red Hat, Inc.