diff mbox series

[v4,01/23] mips: dts: switch to board defines for dtb for mtmips

Message ID ec99d45dc79560ccf740723161af44b3389540e3.1605169080.git.weijie.gao@mediatek.com
State Awaiting Upstream
Delegated to: Daniel Schwierzeck
Headers show
Series Add support for MediaTek MT7620 SoC - v4 | expand

Commit Message

Weijie Gao Nov. 12, 2020, 8:35 a.m. UTC
Previous the dts files for gardena-smart-gateway-mt7688 and
linkit-smart-7688 are set to be built when mtmips is selected.

This can lead to a compilation error if another soc is added to this arch
with different dtsi files.

So it's better to build the dtb only if their board is selected.

Reviewed-by: Stefan Roese <sr@denx.de>
Signed-off-by: Weijie Gao <weijie.gao@mediatek.com>
---
v4 changes: none
v3 changes: none
v2 changes: none
---
 arch/mips/dts/Makefile | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

Comments

Daniel Schwierzeck Nov. 27, 2020, 8:19 p.m. UTC | #1
Am Donnerstag, den 12.11.2020, 16:35 +0800 schrieb Weijie Gao:
> Previous the dts files for gardena-smart-gateway-mt7688 and
> linkit-smart-7688 are set to be built when mtmips is selected.
> 
> This can lead to a compilation error if another soc is added to this arch
> with different dtsi files.
> 
> So it's better to build the dtb only if their board is selected.
> 
> Reviewed-by: Stefan Roese <sr@denx.de>
> Signed-off-by: Weijie Gao <weijie.gao@mediatek.com>
> ---
> v4 changes: none
> v3 changes: none
> v2 changes: none
> ---
>  arch/mips/dts/Makefile | 5 ++---
>  1 file changed, 2 insertions(+), 3 deletions(-)
> 
> 

series applied to u-boot-mips/next, thanks.
Weijie Gao Jan. 18, 2021, 7:54 a.m. UTC | #2
On Fri, 2020-11-27 at 21:19 +0100, Daniel Schwierzeck wrote:
> Am Donnerstag, den 12.11.2020, 16:35 +0800 schrieb Weijie Gao:
> > Previous the dts files for gardena-smart-gateway-mt7688 and
> > linkit-smart-7688 are set to be built when mtmips is selected.
> > 
> > This can lead to a compilation error if another soc is added to this arch
> > with different dtsi files.
> > 
> > So it's better to build the dtb only if their board is selected.
> > 
> > Reviewed-by: Stefan Roese <sr@denx.de>
> > Signed-off-by: Weijie Gao <weijie.gao@mediatek.com>
> > ---
> > v4 changes: none
> > v3 changes: none
> > v2 changes: none
> > ---
> >  arch/mips/dts/Makefile | 5 ++---
> >  1 file changed, 2 insertions(+), 3 deletions(-)
> > 
> > 
> 
> series applied to u-boot-mips/next, thanks.
> 

Hi Daniel,

Gentle ping

I'm just curious when can the patch series be merged into u-boot/master?

Regards
Daniel Schwierzeck Jan. 18, 2021, 9:43 p.m. UTC | #3
Am Montag, den 18.01.2021, 15:54 +0800 schrieb Weijie Gao:
> On Fri, 2020-11-27 at 21:19 +0100, Daniel Schwierzeck wrote:
> > Am Donnerstag, den 12.11.2020, 16:35 +0800 schrieb Weijie Gao:
> > > Previous the dts files for gardena-smart-gateway-mt7688 and
> > > linkit-smart-7688 are set to be built when mtmips is selected.
> > > 
> > > This can lead to a compilation error if another soc is added to this arch
> > > with different dtsi files.
> > > 
> > > So it's better to build the dtb only if their board is selected.
> > > 
> > > Reviewed-by: Stefan Roese <sr@denx.de>
> > > Signed-off-by: Weijie Gao <weijie.gao@mediatek.com>
> > > ---
> > > v4 changes: none
> > > v3 changes: none
> > > v2 changes: none
> > > ---
> > >  arch/mips/dts/Makefile | 5 ++---
> > >  1 file changed, 2 insertions(+), 3 deletions(-)
> > > 
> > > 
> > 
> > series applied to u-boot-mips/next, thanks.
> > 
> 
> Hi Daniel,
> 
> Gentle ping
> 
> I'm just curious when can the patch series be merged into u-boot/master?
> 

Hi Weijie,

thanks for the reminder, I missed the opening of the merge window ;) 

I rebased the MIPS next branch and triggered all CI builds. If all is
ok, I'll prepare a pull request.
Weijie Gao Jan. 19, 2021, 12:58 a.m. UTC | #4
On Mon, 2021-01-18 at 22:43 +0100, Daniel Schwierzeck wrote:
> Am Montag, den 18.01.2021, 15:54 +0800 schrieb Weijie Gao:
> > On Fri, 2020-11-27 at 21:19 +0100, Daniel Schwierzeck wrote:
> > > Am Donnerstag, den 12.11.2020, 16:35 +0800 schrieb Weijie Gao:
> > > > Previous the dts files for gardena-smart-gateway-mt7688 and
> > > > linkit-smart-7688 are set to be built when mtmips is selected.
> > > > 
> > > > This can lead to a compilation error if another soc is added to this arch
> > > > with different dtsi files.
> > > > 
> > > > So it's better to build the dtb only if their board is selected.
> > > > 
> > > > Reviewed-by: Stefan Roese <sr@denx.de>
> > > > Signed-off-by: Weijie Gao <weijie.gao@mediatek.com>
> > > > ---
> > > > v4 changes: none
> > > > v3 changes: none
> > > > v2 changes: none
> > > > ---
> > > >  arch/mips/dts/Makefile | 5 ++---
> > > >  1 file changed, 2 insertions(+), 3 deletions(-)
> > > > 
> > > > 
> > > 
> > > series applied to u-boot-mips/next, thanks.
> > > 
> > 
> > Hi Daniel,
> > 
> > Gentle ping
> > 
> > I'm just curious when can the patch series be merged into u-boot/master?
> > 
> 
> Hi Weijie,
> 
> thanks for the reminder, I missed the opening of the merge window ;) 
> 
> I rebased the MIPS next branch and triggered all CI builds. If all is
> ok, I'll prepare a pull request.
> 

got it. thanks.
diff mbox series

Patch

diff --git a/arch/mips/dts/Makefile b/arch/mips/dts/Makefile
index dc85901dca..e82f96d4e4 100644
--- a/arch/mips/dts/Makefile
+++ b/arch/mips/dts/Makefile
@@ -1,8 +1,5 @@ 
 # SPDX-License-Identifier: GPL-2.0+
 
-dtb-$(CONFIG_ARCH_MTMIPS) += \
-	gardena-smart-gateway-mt7688.dtb \
-	linkit-smart-7688.dtb
 dtb-$(CONFIG_TARGET_AP121) += ap121.dtb
 dtb-$(CONFIG_TARGET_AP143) += ap143.dtb
 dtb-$(CONFIG_TARGET_AP152) += ap152.dtb
@@ -18,6 +15,8 @@  dtb-$(CONFIG_BOARD_COMTREND_VR3032U) += comtrend,vr-3032u.dtb
 dtb-$(CONFIG_BOARD_COMTREND_WAP5813N) += comtrend,wap-5813n.dtb
 dtb-$(CONFIG_BOARD_HUAWEI_HG556A) += huawei,hg556a.dtb
 dtb-$(CONFIG_BOARD_MT7628_RFB) += mediatek,mt7628-rfb.dtb
+dtb-$(CONFIG_BOARD_GARDENA_SMART_GATEWAY_MT7688) += gardena-smart-gateway-mt7688.dtb
+dtb-$(CONFIG_BOARD_LINKIT_SMART_7688) += linkit-smart-7688.dtb
 dtb-$(CONFIG_TARGET_OCTEON_EBB7304) += mrvl,octeon-ebb7304.dtb
 dtb-$(CONFIG_BOARD_NETGEAR_CG3100D) += netgear,cg3100d.dtb
 dtb-$(CONFIG_BOARD_NETGEAR_DGND3700V2) += netgear,dgnd3700v2.dtb