From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michal Simek Date: Tue, 23 Feb 2016 08:06:28 +0100 Subject: [U-Boot] [U-Boot, v3, 3/3] kbuild: fix build rule of u-boot-spl.dtb In-Reply-To: References: <1454662514-10530-4-git-send-email-yamada.masahiro@socionext.com> <20160208204953.GG25786@bill-the-cat> <56CB2E93.2060205@monstr.eu> <20160222161634.GH23166@bill-the-cat> Message-ID: <56CC04F4.50407@monstr.eu> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de On 23.2.2016 03:57, Masahiro Yamada wrote: > Hi Michal, Tom, Simon > > > > > 2016-02-23 1:16 GMT+09:00 Tom Rini : >> On Mon, Feb 22, 2016 at 04:51:47PM +0100, Michal Simek wrote: >>> Hi, >>> >>> On 8.2.2016 21:49, Tom Rini wrote: >>>> On Fri, Feb 05, 2016 at 05:55:14PM +0900, Masahiro Yamada wrote: >>>> >>>>> The build command of u-boot-spl.dtb is not constant, but dependent >>>>> on CONFIG_OF_SPL_REMOVE_PROPS. Use $(call if_changed,...) so that >>>>> the change of CONFIG_OF_SPL_REMOVE_PROPS is detected. >>>>> >>>>> Also, add tools/fdtgrep to the dependency to make sure u-boot-spl.dtb >>>>> is generated by the up-to-date fdtgrep in case the tool is modified. >>>>> >>>>> Signed-off-by: Masahiro Yamada >>>>> Reviewed-by: Simon Glass >>>> >>>> Applied to u-boot/master, thanks! >>> >>> This patch is breaking build for Microblaze SPL. >>> make microblaze-generic_defconfig && make -j >> >> Can you poke around a bit more at what rule is likely needing an update >> here? FWIW, when this was merged microblaze was broken due to the >> eth-uclass.c problem so that's how I missed it, sorry! > > > This breakage is not due to this commit. > > Even if I revert commit 35b786780f3 ("kbuild: fix build rule of > u-boot-spl.dtb"), this board is still broken. That's interesting. I found this commit by bisect. > > I suspect the problem is in the fdtgrep tool itself. Anyway I was playing with it and this is supposed to be a fix. fdtgrep tool is expecting more nodes to be present in DTS file. Because mb dts is generic because every hw design is different dts is quite empty. Masahiro: Can you please try this and build it? Thanks, Michal diff --git a/arch/microblaze/dts/microblaze-generic.dts b/arch/microblaze/dts/microblaze-generic.dts index 203330987bda..08a1396f2db2 100644 --- a/arch/microblaze/dts/microblaze-generic.dts +++ b/arch/microblaze/dts/microblaze-generic.dts @@ -4,4 +4,6 @@ #size-cells = <1>; aliases { } ; + chosen { + } ; } ; -- Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91 w: www.monstr.eu p: +42-0-721842854 Maintainer of Linux kernel - Microblaze cpu - http://www.monstr.eu/fdt/ Maintainer of Linux kernel - Xilinx Zynq ARM architecture Microblaze U-BOOT custodian and responsible for u-boot arm zynq platform -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 181 bytes Desc: OpenPGP digital signature URL: