1. Patchew
  2. EDK2
  3. View series

[edk2-devel] [PATCH edk2-platforms] Platforms/Hisilicon: update OptionRomPkg path for HiKey

Leif Lindholm posted 1 patch 4 years, 10 months ago
Failed in applying to current master (apply log)
Platform/Hisilicon/HiKey/HiKey.dsc | 2 +-
Platform/Hisilicon/HiKey/HiKey.fdf | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
[edk2-devel] [PATCH edk2-platforms] Platforms/Hisilicon: update OptionRomPkg path for HiKey
Posted by Leif Lindholm 4 years, 10 months ago 
The migration of OptionRomPkg to edk2-platforms broke the HiKey build.
Update the paths in .dsc/.fdf to restore.

Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>
---
 Platform/Hisilicon/HiKey/HiKey.dsc | 2 +-
 Platform/Hisilicon/HiKey/HiKey.fdf | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Platform/Hisilicon/HiKey/HiKey.dsc b/Platform/Hisilicon/HiKey/HiKey.dsc
index c785af6e69..bcbe4fafce 100644
--- a/Platform/Hisilicon/HiKey/HiKey.dsc
+++ b/Platform/Hisilicon/HiKey/HiKey.dsc
@@ -246,7 +246,7 @@ [Components.common]
   #
   # AX88772 Ethernet Driver
   #
-  OptionRomPkg/Bus/Usb/UsbNetworking/Ax88772b/Ax88772b.inf
+  Drivers/OptionRomPkg/Bus/Usb/UsbNetworking/Ax88772b/Ax88772b.inf
 
   #
   # FAT filesystem + GPT/MBR partitioning
diff --git a/Platform/Hisilicon/HiKey/HiKey.fdf b/Platform/Hisilicon/HiKey/HiKey.fdf
index 2b2e3ad053..33fa0da208 100644
--- a/Platform/Hisilicon/HiKey/HiKey.fdf
+++ b/Platform/Hisilicon/HiKey/HiKey.fdf
@@ -158,7 +158,7 @@ [FV.FvMain]
   #
   # AX88772 Ethernet Driver for Apple Ethernet Adapter
   #
-  INF OptionRomPkg/Bus/Usb/UsbNetworking/Ax88772b/Ax88772b.inf
+  INF Drivers/OptionRomPkg/Bus/Usb/UsbNetworking/Ax88772b/Ax88772b.inf
 
   #
   # FAT filesystem + GPT/MBR partitioning
-- 
2.11.0


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#42353): https://edk2.groups.io/g/devel/message/42353
Mute This Topic: https://groups.io/mt/32051247/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [PATCH edk2-platforms] Platforms/Hisilicon: update OptionRomPkg path for HiKey
Posted by Ard Biesheuvel 4 years, 10 months ago 
On Thu, 13 Jun 2019 at 13:41, Leif Lindholm <leif.lindholm@linaro.org> wrote:
>
> The migration of OptionRomPkg to edk2-platforms broke the HiKey build.
> Update the paths in .dsc/.fdf to restore.
>
> Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>

Acked-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>

> ---
>  Platform/Hisilicon/HiKey/HiKey.dsc | 2 +-
>  Platform/Hisilicon/HiKey/HiKey.fdf | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/Platform/Hisilicon/HiKey/HiKey.dsc b/Platform/Hisilicon/HiKey/HiKey.dsc
> index c785af6e69..bcbe4fafce 100644
> --- a/Platform/Hisilicon/HiKey/HiKey.dsc
> +++ b/Platform/Hisilicon/HiKey/HiKey.dsc
> @@ -246,7 +246,7 @@ [Components.common]
>    #
>    # AX88772 Ethernet Driver
>    #
> -  OptionRomPkg/Bus/Usb/UsbNetworking/Ax88772b/Ax88772b.inf
> +  Drivers/OptionRomPkg/Bus/Usb/UsbNetworking/Ax88772b/Ax88772b.inf
>
>    #
>    # FAT filesystem + GPT/MBR partitioning
> diff --git a/Platform/Hisilicon/HiKey/HiKey.fdf b/Platform/Hisilicon/HiKey/HiKey.fdf
> index 2b2e3ad053..33fa0da208 100644
> --- a/Platform/Hisilicon/HiKey/HiKey.fdf
> +++ b/Platform/Hisilicon/HiKey/HiKey.fdf
> @@ -158,7 +158,7 @@ [FV.FvMain]
>    #
>    # AX88772 Ethernet Driver for Apple Ethernet Adapter
>    #
> -  INF OptionRomPkg/Bus/Usb/UsbNetworking/Ax88772b/Ax88772b.inf
> +  INF Drivers/OptionRomPkg/Bus/Usb/UsbNetworking/Ax88772b/Ax88772b.inf
>
>    #
>    # FAT filesystem + GPT/MBR partitioning
> --
> 2.11.0
>

-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#42354): https://edk2.groups.io/g/devel/message/42354
Mute This Topic: https://groups.io/mt/32051247/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [PATCH edk2-platforms] Platforms/Hisilicon: update OptionRomPkg path for HiKey
Posted by Leif Lindholm 4 years, 10 months ago 
On Thu, Jun 13, 2019 at 01:42:29PM +0200, Ard Biesheuvel wrote:
> On Thu, 13 Jun 2019 at 13:41, Leif Lindholm <leif.lindholm@linaro.org> wrote:
> >
> > The migration of OptionRomPkg to edk2-platforms broke the HiKey build.
> > Update the paths in .dsc/.fdf to restore.
> >
> > Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>
> 
> Acked-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>

Thanks!
Pushed as 06910756b8.

> > ---
> >  Platform/Hisilicon/HiKey/HiKey.dsc | 2 +-
> >  Platform/Hisilicon/HiKey/HiKey.fdf | 2 +-
> >  2 files changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/Platform/Hisilicon/HiKey/HiKey.dsc b/Platform/Hisilicon/HiKey/HiKey.dsc
> > index c785af6e69..bcbe4fafce 100644
> > --- a/Platform/Hisilicon/HiKey/HiKey.dsc
> > +++ b/Platform/Hisilicon/HiKey/HiKey.dsc
> > @@ -246,7 +246,7 @@ [Components.common]
> >    #
> >    # AX88772 Ethernet Driver
> >    #
> > -  OptionRomPkg/Bus/Usb/UsbNetworking/Ax88772b/Ax88772b.inf
> > +  Drivers/OptionRomPkg/Bus/Usb/UsbNetworking/Ax88772b/Ax88772b.inf
> >
> >    #
> >    # FAT filesystem + GPT/MBR partitioning
> > diff --git a/Platform/Hisilicon/HiKey/HiKey.fdf b/Platform/Hisilicon/HiKey/HiKey.fdf
> > index 2b2e3ad053..33fa0da208 100644
> > --- a/Platform/Hisilicon/HiKey/HiKey.fdf
> > +++ b/Platform/Hisilicon/HiKey/HiKey.fdf
> > @@ -158,7 +158,7 @@ [FV.FvMain]
> >    #
> >    # AX88772 Ethernet Driver for Apple Ethernet Adapter
> >    #
> > -  INF OptionRomPkg/Bus/Usb/UsbNetworking/Ax88772b/Ax88772b.inf
> > +  INF Drivers/OptionRomPkg/Bus/Usb/UsbNetworking/Ax88772b/Ax88772b.inf
> >
> >    #
> >    # FAT filesystem + GPT/MBR partitioning
> > --
> > 2.11.0
> >
> 
> 
> 

-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#42356): https://edk2.groups.io/g/devel/message/42356
Mute This Topic: https://groups.io/mt/32051247/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-

Patchew 2.1-devel-0870f84

© 2016 - 2024 Red Hat, Inc.