1. Patchew
  2. EDK2
  3. View series

[edk2-devel] [edk2-platforms: PATCH v4] Marvell/Armada80x0Db: Fix build

Marcin Wojtas posted 1 patch 4 months ago
Failed in applying to current master (apply log)
Platform/Marvell/Armada80x0Db/Armada80x0Db.dsc | 3 +++
1 file changed, 3 insertions(+)
[edk2-devel] [edk2-platforms: PATCH v4] Marvell/Armada80x0Db: Fix build
Posted by Marcin Wojtas 4 months ago 
Commit ec5de71d83 ("Silicon/Marvell: Restructure package")
broke Armada80x0Db build by unintentional removal of
device tree component. Restore it.

Signed-off-by: Marcin Wojtas <marcin.s.wojtas@gmail.com>
---
 Platform/Marvell/Armada80x0Db/Armada80x0Db.dsc | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Platform/Marvell/Armada80x0Db/Armada80x0Db.dsc b/Platform/Marvell/Armada80x0Db/Armada80x0Db.dsc
index 22a0040265..501811a050 100644
--- a/Platform/Marvell/Armada80x0Db/Armada80x0Db.dsc
+++ b/Platform/Marvell/Armada80x0Db/Armada80x0Db.dsc
@@ -31,6 +31,9 @@
 
 !include MdePkg/MdeLibs.dsc.inc
 
+[Components.common]
+  Silicon/Marvell/Armada7k8k/DeviceTree/Armada80x0Db.inf
+
 [Components.AARCH64]
   Silicon/Marvell/Armada7k8k/AcpiTables/Armada80x0Db.inf
 
-- 
2.34.1



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#113051): https://edk2.groups.io/g/devel/message/113051
Mute This Topic: https://groups.io/mt/103490025/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [edk2-platforms: PATCH v4] Marvell/Armada80x0Db: Fix build
Posted by Ard Biesheuvel 3 months, 4 weeks ago 
On Sun, 31 Dec 2023 at 12:07, Marcin Wojtas <marcin.s.wojtas@gmail.com> wrote:
>
> Commit ec5de71d83 ("Silicon/Marvell: Restructure package")
> broke Armada80x0Db build by unintentional removal of
> device tree component. Restore it.
>
> Signed-off-by: Marcin Wojtas <marcin.s.wojtas@gmail.com>

Applied, thanks.

> ---
>  Platform/Marvell/Armada80x0Db/Armada80x0Db.dsc | 3 +++
>  1 file changed, 3 insertions(+)
>
> diff --git a/Platform/Marvell/Armada80x0Db/Armada80x0Db.dsc b/Platform/Marvell/Armada80x0Db/Armada80x0Db.dsc
> index 22a0040265..501811a050 100644
> --- a/Platform/Marvell/Armada80x0Db/Armada80x0Db.dsc
> +++ b/Platform/Marvell/Armada80x0Db/Armada80x0Db.dsc
> @@ -31,6 +31,9 @@
>
>  !include MdePkg/MdeLibs.dsc.inc
>
> +[Components.common]
> +  Silicon/Marvell/Armada7k8k/DeviceTree/Armada80x0Db.inf
> +
>  [Components.AARCH64]
>    Silicon/Marvell/Armada7k8k/AcpiTables/Armada80x0Db.inf
>
> --
> 2.34.1
>


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#113090): https://edk2.groups.io/g/devel/message/113090
Mute This Topic: https://groups.io/mt/103490025/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [edk2-platforms: PATCH v4] Marvell/Armada80x0Db: Fix build
Posted by Narinder Dhillon 4 months ago 
Marcin,
I don't see this folder in code, how is it generated ?
Thanks
Narinder

> -----Original Message-----
> From: Marcin Wojtas <marcin.s.wojtas@gmail.com>
> Sent: Sunday, December 31, 2023 3:07 AM
> To: devel@edk2.groups.io
> Cc: quic_llindhol@quicinc.com; ardb+tianocore@kernel.org;
> mw@semihalf.com; Narinder Dhillon <ndhillon@marvell.com>; Marcin
> Wojtas <marcin.s.wojtas@gmail.com>
> Subject: [EXT] [edk2-platforms: PATCH v4] Marvell/Armada80x0Db: Fix build
> 
> External Email
> 
> ----------------------------------------------------------------------
> Commit ec5de71d83 ("Silicon/Marvell: Restructure package") broke
> Armada80x0Db build by unintentional removal of device tree component.
> Restore it.
> 
> Signed-off-by: Marcin Wojtas <marcin.s.wojtas@gmail.com>
> ---
>  Platform/Marvell/Armada80x0Db/Armada80x0Db.dsc | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/Platform/Marvell/Armada80x0Db/Armada80x0Db.dsc
> b/Platform/Marvell/Armada80x0Db/Armada80x0Db.dsc
> index 22a0040265..501811a050 100644
> --- a/Platform/Marvell/Armada80x0Db/Armada80x0Db.dsc
> +++ b/Platform/Marvell/Armada80x0Db/Armada80x0Db.dsc
> @@ -31,6 +31,9 @@
>   !include MdePkg/MdeLibs.dsc.inc +[Components.common]+
> Silicon/Marvell/Armada7k8k/DeviceTree/Armada80x0Db.inf+
> [Components.AARCH64]
> Silicon/Marvell/Armada7k8k/AcpiTables/Armada80x0Db.inf --
> 2.34.1



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#113042): https://edk2.groups.io/g/devel/message/113042
Mute This Topic: https://groups.io/mt/103490025/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [edk2-platforms: PATCH v4] Marvell/Armada80x0Db: Fix build
Posted by Marcin Wojtas 4 months ago 
Hi Narinder,

wt., 2 sty 2024 o 21:57 Narinder Dhillon <ndhillon@marvell.com> napisał(a):
>
> Marcin,
> I don't see this folder in code, how is it generated ?

It's simply exisitng there:
Platform/Marvell/Armada80x0Db/Armada80x0Db.dsc in edk2-platforms,
nothing is generated.

Here's part of the patch, that introduced regression:
https://github.com/tianocore/edk2-platforms/commit/ec5de71d83f3a6327c90887456782d15565e6e36#diff-ce7de187b6e203a8e22916145bdc2a35f7c922609105c4282932f02dee7bb84fL34

Best regards,
Marcin


> Thanks
> Narinder
>
> > -----Original Message-----
> > From: Marcin Wojtas <marcin.s.wojtas@gmail.com>
> > Sent: Sunday, December 31, 2023 3:07 AM
> > To: devel@edk2.groups.io
> > Cc: quic_llindhol@quicinc.com; ardb+tianocore@kernel.org;
> > mw@semihalf.com; Narinder Dhillon <ndhillon@marvell.com>; Marcin
> > Wojtas <marcin.s.wojtas@gmail.com>
> > Subject: [EXT] [edk2-platforms: PATCH v4] Marvell/Armada80x0Db: Fix build
> >
> > External Email
> >
> > ----------------------------------------------------------------------
> > Commit ec5de71d83 ("Silicon/Marvell: Restructure package") broke
> > Armada80x0Db build by unintentional removal of device tree component.
> > Restore it.
> >
> > Signed-off-by: Marcin Wojtas <marcin.s.wojtas@gmail.com>
> > ---
> >  Platform/Marvell/Armada80x0Db/Armada80x0Db.dsc | 3 +++
> >  1 file changed, 3 insertions(+)
> >
> > diff --git a/Platform/Marvell/Armada80x0Db/Armada80x0Db.dsc
> > b/Platform/Marvell/Armada80x0Db/Armada80x0Db.dsc
> > index 22a0040265..501811a050 100644
> > --- a/Platform/Marvell/Armada80x0Db/Armada80x0Db.dsc
> > +++ b/Platform/Marvell/Armada80x0Db/Armada80x0Db.dsc
> > @@ -31,6 +31,9 @@
> >   !include MdePkg/MdeLibs.dsc.inc +[Components.common]+
> > Silicon/Marvell/Armada7k8k/DeviceTree/Armada80x0Db.inf+
> > [Components.AARCH64]
> > Silicon/Marvell/Armada7k8k/AcpiTables/Armada80x0Db.inf --
> > 2.34.1
>


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#113053): https://edk2.groups.io/g/devel/message/113053
Mute This Topic: https://groups.io/mt/103490025/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [edk2-platforms: PATCH v4] Marvell/Armada80x0Db: Fix build
Posted by Marcin Wojtas 4 months ago 
śr., 3 sty 2024 o 00:39 Marcin Wojtas <marcin.s.wojtas@gmail.com> napisał(a):
>
> Hi Narinder,
>
> wt., 2 sty 2024 o 21:57 Narinder Dhillon <ndhillon@marvell.com> napisał(a):
> >
> > Marcin,
> > I don't see this folder in code, how is it generated ?
>
> It's simply exisitng there:
> Platform/Marvell/Armada80x0Db/Armada80x0Db.dsc in edk2-platforms,
> nothing is generated.
>

If you meant the device tree itself, it's part of edk2-non-osi:
https://github.com/tianocore/edk2-non-osi/tree/master/Silicon/Marvell/Armada7k8k/DeviceTree

> Here's part of the patch, that introduced regression:
> https://github.com/tianocore/edk2-platforms/commit/ec5de71d83f3a6327c90887456782d15565e6e36#diff-ce7de187b6e203a8e22916145bdc2a35f7c922609105c4282932f02dee7bb84fL34
>
> Best regards,
> Marcin
>
>
> > Thanks
> > Narinder
> >
> > > -----Original Message-----
> > > From: Marcin Wojtas <marcin.s.wojtas@gmail.com>
> > > Sent: Sunday, December 31, 2023 3:07 AM
> > > To: devel@edk2.groups.io
> > > Cc: quic_llindhol@quicinc.com; ardb+tianocore@kernel.org;
> > > mw@semihalf.com; Narinder Dhillon <ndhillon@marvell.com>; Marcin
> > > Wojtas <marcin.s.wojtas@gmail.com>
> > > Subject: [EXT] [edk2-platforms: PATCH v4] Marvell/Armada80x0Db: Fix build
> > >
> > > External Email
> > >
> > > ----------------------------------------------------------------------
> > > Commit ec5de71d83 ("Silicon/Marvell: Restructure package") broke
> > > Armada80x0Db build by unintentional removal of device tree component.
> > > Restore it.
> > >
> > > Signed-off-by: Marcin Wojtas <marcin.s.wojtas@gmail.com>
> > > ---
> > >  Platform/Marvell/Armada80x0Db/Armada80x0Db.dsc | 3 +++
> > >  1 file changed, 3 insertions(+)
> > >
> > > diff --git a/Platform/Marvell/Armada80x0Db/Armada80x0Db.dsc
> > > b/Platform/Marvell/Armada80x0Db/Armada80x0Db.dsc
> > > index 22a0040265..501811a050 100644
> > > --- a/Platform/Marvell/Armada80x0Db/Armada80x0Db.dsc
> > > +++ b/Platform/Marvell/Armada80x0Db/Armada80x0Db.dsc
> > > @@ -31,6 +31,9 @@
> > >   !include MdePkg/MdeLibs.dsc.inc +[Components.common]+
> > > Silicon/Marvell/Armada7k8k/DeviceTree/Armada80x0Db.inf+
> > > [Components.AARCH64]
> > > Silicon/Marvell/Armada7k8k/AcpiTables/Armada80x0Db.inf --
> > > 2.34.1
> >


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#113054): https://edk2.groups.io/g/devel/message/113054
Mute This Topic: https://groups.io/mt/103490025/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [edk2-platforms: PATCH v4] Marvell/Armada80x0Db: Fix build
Posted by Narinder Dhillon 4 months ago 
Sorry, that was my mistake.

> -----Original Message-----
> From: Marcin Wojtas <marcin.s.wojtas@gmail.com>
> Sent: Tuesday, January 2, 2024 3:46 PM
> To: Narinder Dhillon <ndhillon@marvell.com>
> Cc: devel@edk2.groups.io; quic_llindhol@quicinc.com;
> ardb+tianocore@kernel.org; mw@semihalf.com
> Subject: Re: [EXT] [edk2-platforms: PATCH v4] Marvell/Armada80x0Db: Fix
> build
> 
> śr., 3 sty 2024 o 00:39 Marcin Wojtas <marcin.s.wojtas@gmail.com>
> napisał(a):
> >
> > Hi Narinder,
> >
> > wt., 2 sty 2024 o 21:57 Narinder Dhillon <ndhillon@marvell.com> napisał(a):
> > >
> > > Marcin,
> > > I don't see this folder in code, how is it generated ?
> >
> > It's simply exisitng there:
> > Platform/Marvell/Armada80x0Db/Armada80x0Db.dsc in edk2-platforms,
> > nothing is generated.
> >
> 
> If you meant the device tree itself, it's part of edk2-non-osi:
> https://urldefense.proofpoint.com/v2/url?u=https-
> 3A__github.com_tianocore_edk2-2Dnon-
> 2Dosi_tree_master_Silicon_Marvell_Armada7k8k_DeviceTree&d=DwIFaQ&c
> =nKjWec2b6R0mOyPaz7xtfQ&r=1o2VA7xKsHvmQ4HFRY2JZggF-
> gGh1t4bxHFABsB1WTo&m=08gOJ2_xAynyvW3O-
> oNDWKoDc3FWWZiADHsHA1mnARRZOkvbYWJ4uGoI6qAZcinn&s=5fqFKjdJ3
> B1m_UCEsRzwqJ8rVqshTAD_ZyN0IlUHTFQ&e=
> 
> > Here's part of the patch, that introduced regression:
> > https://urldefense.proofpoint.com/v2/url?u=https-
> 3A__github.com_tianoc
> > ore_edk2-
> 2Dplatforms_commit_ec5de71d83f3a6327c90887456782d15565e6e36-2
> > 3diff-
> 2Dce7de187b6e203a8e22916145bdc2a35f7c922609105c4282932f02dee7bb8
> >
> 4fL34&d=DwIFaQ&c=nKjWec2b6R0mOyPaz7xtfQ&r=1o2VA7xKsHvmQ4HFRY
> 2JZggF-gGh
> > 1t4bxHFABsB1WTo&m=08gOJ2_xAynyvW3O-
> oNDWKoDc3FWWZiADHsHA1mnARRZOkvbYWJ4
> > uGoI6qAZcinn&s=35ZI6uHnNjYbaOe39H4hr7Z0ljJLZl_ODejRzU9WBDk&e=
> >
> > Best regards,
> > Marcin
> >
> >
> > > Thanks
> > > Narinder
> > >
> > > > -----Original Message-----
> > > > From: Marcin Wojtas <marcin.s.wojtas@gmail.com>
> > > > Sent: Sunday, December 31, 2023 3:07 AM
> > > > To: devel@edk2.groups.io
> > > > Cc: quic_llindhol@quicinc.com; ardb+tianocore@kernel.org;
> > > > mw@semihalf.com; Narinder Dhillon <ndhillon@marvell.com>; Marcin
> > > > Wojtas <marcin.s.wojtas@gmail.com>
> > > > Subject: [EXT] [edk2-platforms: PATCH v4] Marvell/Armada80x0Db:
> > > > Fix build
> > > >
> > > > External Email
> > > >
> > > > ------------------------------------------------------------------
> > > > ---- Commit ec5de71d83 ("Silicon/Marvell: Restructure package")
> > > > broke Armada80x0Db build by unintentional removal of device tree
> > > > component.
> > > > Restore it.
> > > >
> > > > Signed-off-by: Marcin Wojtas <marcin.s.wojtas@gmail.com>
> > > > ---
> > > >  Platform/Marvell/Armada80x0Db/Armada80x0Db.dsc | 3 +++
> > > >  1 file changed, 3 insertions(+)
> > > >
> > > > diff --git a/Platform/Marvell/Armada80x0Db/Armada80x0Db.dsc
> > > > b/Platform/Marvell/Armada80x0Db/Armada80x0Db.dsc
> > > > index 22a0040265..501811a050 100644
> > > > --- a/Platform/Marvell/Armada80x0Db/Armada80x0Db.dsc
> > > > +++ b/Platform/Marvell/Armada80x0Db/Armada80x0Db.dsc
> > > > @@ -31,6 +31,9 @@
> > > >   !include MdePkg/MdeLibs.dsc.inc +[Components.common]+
> > > > Silicon/Marvell/Armada7k8k/DeviceTree/Armada80x0Db.inf+
> > > > [Components.AARCH64]
> > > > Silicon/Marvell/Armada7k8k/AcpiTables/Armada80x0Db.inf --
> > > > 2.34.1
> > >


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#113043): https://edk2.groups.io/g/devel/message/113043
Mute This Topic: https://groups.io/mt/103490025/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.