[U-Boot] [PATCH v6 09/13] binman: Automatically include a U-Boot .dtsi file

[Simon Glass]

On 17 December 2016 at 20:41, Bin Meng <bmeng.cn at gmail.com> wrote:
> On Sat, Nov 26, 2016 at 11:15 AM, Simon Glass <sjg at chromium.org> wrote:
>> For boards that need U-Boot-specific additions to the device tree, it is
>> a minor annoyance to have to add these each time the tree is synced with
>> upstream.
>>
>> Add a means to include a file (e.g. u-boot.dtsi) automatically into the .dts
>> file before it is compiled.
>>
>> The file uses is the first one that exists in this list:
>>
>>    arch/<arch>/dts/<board.dts>-u-boot.dtsi
>>    arch/<arch>/dts/<soc>-u-boot.dtsi
>>    arch/<arch>/dts/<cpu>-u-boot.dtsi
>>    arch/<arch>/dts/<vendor>-u-boot.dtsi
>>    arch/<arch>/dts/u-boot.dtsi
>>
>> Signed-off-by: Simon Glass <sjg at chromium.org>
>> Suggested-by: Tom Rini <trini at konsulko.com>
>> ---
>>
>> Changes in v6: None
>> Changes in v5:
>> - Add a Makefile 'warning' line for debugging
>> - Add documentation for this feature
>> - Change the Makefile variable from binman_... to u_boot_...
>>
>> Changes in v4:
>> - Add an option to bring in an soc .dtsi file also
>>
>> Changes in v3:
>> - Add a new patch to automatically include a U-Boot .dtsi file
>>
>> Changes in v2: None
>>
>>  scripts/Makefile.lib | 20 +++++++++++++++++++-
>>  tools/binman/README  | 39 +++++++++++++++++++++++++++++++++++++++
>>  2 files changed, 58 insertions(+), 1 deletion(-)
>>
>
> Reviewed-by: Bin Meng <bmeng.cn at gmail.com>
> Tested-by: Bin Meng <bmeng.cn at gmail.com>

Applied to u-boot-dm and now in mainline.