diff mbox series

[1/2] MIPS: dts: remove bogus bcm96358nb4ser.dtb from dtb-y entry

Message ID 1509859853-27473-2-git-send-email-yamada.masahiro@socionext.com
State Accepted
Commit 3cad14d56adbf7d621fc5a35db42f3acc0a2d6e8
Headers show
Series [1/2] MIPS: dts: remove bogus bcm96358nb4ser.dtb from dtb-y entry | expand

Commit Message

Masahiro Yamada Nov. 5, 2017, 5:30 a.m. UTC
arch/mips/boot/dts/brcm/bcm96358nb4ser.dts does not exist, so
we cannot build bcm96358nb4ser.dtb .

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>

---

 arch/mips/boot/dts/brcm/Makefile | 1 -
 1 file changed, 1 deletion(-)

-- 
2.7.4

Comments

Rob Herring Nov. 8, 2017, 4:51 p.m. UTC | #1
On Mon, Nov 6, 2017 at 5:00 AM, Masahiro Yamada
<yamada.masahiro@socionext.com> wrote:
> 2017-11-06 19:41 GMT+09:00 James Hogan <jhogan@kernel.org>:

>> Hi,

>>

>> On Sun, Nov 05, 2017 at 11:11:38PM +0900, Masahiro Yamada wrote:

>>> +CC Ralf Baechle <ralf@linux-mips.org>

>>> +CC linux-mips@linux-mips.org

>>> +CC Kevin Cernekee <cernekee@gmail.com>

>>> +CC Florian Fainelli <f.fainelli@gmail.com>

>>>

>>>

>>> I missed to CC MIPS maintainers.

>>

>> Yes, please resend the patch so it lands in patchwork.linux-mips.org.

>

>

> This is a part of clean-up series of DT building.

>

> I want Acked-by from MIPS maintainers

> so that the whole series can go to a different tree.

> (DT or Kbuild).

>

>

> Sam addressed more clean-up candidates in MIPS Makefiles

> https://patchwork.kernel.org/patch/10041879/

>

> So, I will probably end up with touching those Makefiles more.

>

> All patches must go to the same tree.

>

>

>>> 2017-11-05 14:30 GMT+09:00 Masahiro Yamada <yamada.masahiro@socionext.com>:

>>> > arch/mips/boot/dts/brcm/bcm96358nb4ser.dts does not exist, so

>>> > we cannot build bcm96358nb4ser.dtb .

>>

>> This appears to be due to the file being renamed in commit 695835511f96

>> ("MIPS: BMIPS: rename bcm96358nb4ser to bcm6358-neufbox4-sercom").

>> Please can you update the commit message when you resend to mention the

>> cause of the problem.

>>

>> You could also add the following if you like while you're at it:

>>

>> Fixes: 695835511f96 ("MIPS: BMIPS: rename bcm96358nb4ser to bcm6358-neufbox4-sercom")

>> Cc: <stable@vger.kernel.org> # 4.9+


I think this one can be applied independently and we'd want it to if
we tag for stable. So I think it can go thru the MIPS tree.

Rob
Masahiro Yamada Nov. 9, 2017, 12:11 a.m. UTC | #2
2017-11-09 1:51 GMT+09:00 Rob Herring <robh+dt@kernel.org>:
> On Mon, Nov 6, 2017 at 5:00 AM, Masahiro Yamada

> <yamada.masahiro@socionext.com> wrote:

>> 2017-11-06 19:41 GMT+09:00 James Hogan <jhogan@kernel.org>:

>>> Hi,

>>>

>>> On Sun, Nov 05, 2017 at 11:11:38PM +0900, Masahiro Yamada wrote:

>>>> +CC Ralf Baechle <ralf@linux-mips.org>

>>>> +CC linux-mips@linux-mips.org

>>>> +CC Kevin Cernekee <cernekee@gmail.com>

>>>> +CC Florian Fainelli <f.fainelli@gmail.com>

>>>>

>>>>

>>>> I missed to CC MIPS maintainers.

>>>

>>> Yes, please resend the patch so it lands in patchwork.linux-mips.org.

>>

>>

>> This is a part of clean-up series of DT building.

>>

>> I want Acked-by from MIPS maintainers

>> so that the whole series can go to a different tree.

>> (DT or Kbuild).

>>

>>

>> Sam addressed more clean-up candidates in MIPS Makefiles

>> https://patchwork.kernel.org/patch/10041879/

>>

>> So, I will probably end up with touching those Makefiles more.

>>

>> All patches must go to the same tree.

>>

>>

>>>> 2017-11-05 14:30 GMT+09:00 Masahiro Yamada <yamada.masahiro@socionext.com>:

>>>> > arch/mips/boot/dts/brcm/bcm96358nb4ser.dts does not exist, so

>>>> > we cannot build bcm96358nb4ser.dtb .

>>>

>>> This appears to be due to the file being renamed in commit 695835511f96

>>> ("MIPS: BMIPS: rename bcm96358nb4ser to bcm6358-neufbox4-sercom").

>>> Please can you update the commit message when you resend to mention the

>>> cause of the problem.

>>>

>>> You could also add the following if you like while you're at it:

>>>

>>> Fixes: 695835511f96 ("MIPS: BMIPS: rename bcm96358nb4ser to bcm6358-neufbox4-sercom")

>>> Cc: <stable@vger.kernel.org> # 4.9+

>

> I think this one can be applied independently and we'd want it to if

> we tag for stable. So I think it can go thru the MIPS tree.

>



As I said to MIPS folks, this patch must go before 2/2.

You picked up only 2/2, so your dt/kbuild branch is broken.


make ARCH=mips allyesconfig
&& make ARCH=mips CROSS_COMPILE=mips-linux- dtbs


will produce the following error.


make[2]: *** No rule to make target
'arch/mips/boot/dts/brcm/bcm96358nb4ser.dtb', needed by '__build'.
Stop.
scripts/Makefile.build:570: recipe for target 'arch/mips/boot/dts/brcm' failed
make[1]: *** [arch/mips/boot/dts/brcm] Error 2
arch/mips/Makefile:413: recipe for target 'dtbs' failed
make: *** [dtbs] Error 2


-- 
Best Regards
Masahiro Yamada
diff mbox series

Patch

diff --git a/arch/mips/boot/dts/brcm/Makefile b/arch/mips/boot/dts/brcm/Makefile
index 69a69d1..ad76130 100644
--- a/arch/mips/boot/dts/brcm/Makefile
+++ b/arch/mips/boot/dts/brcm/Makefile
@@ -22,7 +22,6 @@  dtb-$(CONFIG_DT_NONE) += \
 	bcm63268-comtrend-vr-3032u.dtb \
 	bcm93384wvg.dtb \
 	bcm93384wvg_viper.dtb \
-	bcm96358nb4ser.dtb \
 	bcm96368mvwg.dtb \
 	bcm9ejtagprb.dtb \
 	bcm97125cbmb.dtb \