[PATCH] binman: include <CONFIG_SYS_BOARD>-u-boot.dtsi if exists

[Weijie Gao]

This patch makes it possible to automatically include board-specific
additions to the device tree.

Change-Id: If8cacca58696969fbdd3ede6457d8526b05ebe4f
Signed-off-by: Weijie Gao <weijie.gao at mediatek.com>
---
 doc/develop/devicetree/control.rst | 1 +
 scripts/Makefile.lib               | 2 ++
 tools/binman/binman.rst            | 1 +
 3 files changed, 4 insertions(+)

diff --git a/doc/develop/devicetree/control.rst b/doc/develop/devicetree/control.rst
index 0233945f8b6..ffe6860fe6c 100644
--- a/doc/develop/devicetree/control.rst
+++ b/doc/develop/devicetree/control.rst
@@ -210,6 +210,7 @@ order::
    <CONFIG_SYS_SOC>-u-boot.dtsi
    <CONFIG_SYS_CPU>-u-boot.dtsi
    <CONFIG_SYS_VENDOR>-u-boot.dtsi
+   <CONFIG_SYS_BOARD>-u-boot.dtsi
    u-boot.dtsi
 
 Only one of these is selected but of course you can #include another one within
diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
index 5db2fbc418a..c8fe43e528d 100644
--- a/scripts/Makefile.lib
+++ b/scripts/Makefile.lib
@@ -201,6 +201,7 @@ u_boot_dtsi_options = $(strip $(wildcard $(u_boot_dtsi_loc)$(basename $(notdir $
 	$(wildcard $(u_boot_dtsi_loc)$(subst $\",,$(CONFIG_SYS_SOC))-u-boot.dtsi) \
 	$(wildcard $(u_boot_dtsi_loc)$(subst $\",,$(CONFIG_SYS_CPU))-u-boot.dtsi) \
 	$(wildcard $(u_boot_dtsi_loc)$(subst $\",,$(CONFIG_SYS_VENDOR))-u-boot.dtsi) \
+	$(wildcard $(u_boot_dtsi_loc)$(subst $\",,$(CONFIG_SYS_BOARD))-u-boot.dtsi) \
 	$(wildcard $(u_boot_dtsi_loc)u-boot.dtsi))
 
 u_boot_dtsi_options_raw = $(warning Automatic .dtsi inclusion: options: \
@@ -208,6 +209,7 @@ u_boot_dtsi_options_raw = $(warning Automatic .dtsi inclusion: options: \
 	$(u_boot_dtsi_loc)$(subst $\",,$(CONFIG_SYS_SOC))-u-boot.dtsi \
 	$(u_boot_dtsi_loc)$(subst $\",,$(CONFIG_SYS_CPU))-u-boot.dtsi \
 	$(u_boot_dtsi_loc)$(subst $\",,$(CONFIG_SYS_VENDOR))-u-boot.dtsi \
+	$(u_boot_dtsi_loc)$(subst $\",,$(CONFIG_SYS_BOARD))-u-boot.dtsi \
 	$(u_boot_dtsi_loc)u-boot.dtsi ... \
 	found: $(if $(u_boot_dtsi_options),"$(u_boot_dtsi_options)",nothing!))
 
diff --git a/tools/binman/binman.rst b/tools/binman/binman.rst
index 392e507d449..36e7af80aa2 100644
--- a/tools/binman/binman.rst
+++ b/tools/binman/binman.rst
@@ -1207,6 +1207,7 @@ Binman will search for the following files in arch/<arch>/dts::
    <CONFIG_SYS_SOC>-u-boot.dtsi
    <CONFIG_SYS_CPU>-u-boot.dtsi
    <CONFIG_SYS_VENDOR>-u-boot.dtsi
+   <CONFIG_SYS_BOARD>-u-boot.dtsi
    u-boot.dtsi
 
 U-Boot will only use the first one that it finds. If you need to include a
-- 
2.34.1