[U-Boot] [U-Boot, v3, 3/3] kbuild: fix build rule of u-boot-spl.dtb

[Masahiro Yamada]

Hi Michal,


2016-02-23 16:06 GMT+09:00 Michal Simek <monstr at monstr.eu>:
> On 23.2.2016 03:57, Masahiro Yamada wrote:
>> Hi Michal, Tom, Simon
>>
>>
>>
>>
>> 2016-02-23 1:16 GMT+09:00 Tom Rini <trini at konsulko.com>:
>>> 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 <yamada.masahiro at socionext.com>
>>>>>> Reviewed-by: Simon Glass <sjg at chromium.org>
>>>>>
>>>>> 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 {
> +       } ;
>  } ;
>

Yeah, this fixed the error.  Thanks!


-- 
Best Regards
Masahiro Yamada