Message ID | ec99d45dc79560ccf740723161af44b3389540e3.1605169080.git.weijie.gao@mediatek.com |
---|---|
State | Accepted |
Commit | da41a56059a114725684cc61c93f5f768d1ac734 |
Delegated to: | Daniel Schwierzeck |
Headers | show |
Series | Add support for MediaTek MT7620 SoC - v4 | expand |
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.
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
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.
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.
Hi Weijie, Am Dienstag, den 19.01.2021, 08:58 +0800 schrieb Weijie Gao: > > > > > > 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. in mainline there was a lot of renaming in DM core. I created fixup commits in u-boot-mips/next to fix all build errors. Could you give it short look and test? Thanks.
On Wed, 2021-01-20 at 16:51 +0100, Daniel Schwierzeck wrote: > Hi Weijie, > > Am Dienstag, den 19.01.2021, 08:58 +0800 schrieb Weijie Gao: > > > > > > > > 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. > > in mainline there was a lot of renaming in DM core. I created fixup > commits in u-boot-mips/next to fix all build errors. Could you give it > short look and test? Thanks. > I have tested and all works fine. Regards
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