From 0efc5a9f670144cad7f287711f25c69cba0fde39 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Fri, 17 May 2024 11:49:30 -0600 Subject: doc: process.rst: Document device tree resync rules Document the logic of when we do a full resync of the device trees used by OF_UPSTREAM as well as that cherry-picking is allowed as needed. Signed-off-by: Tom Rini Reviewed-by: Quentin Schulz --- doc/develop/devicetree/control.rst | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'doc/develop/devicetree') diff --git a/doc/develop/devicetree/control.rst b/doc/develop/devicetree/control.rst index 4cc1457d4ea..ca4fb0b5b10 100644 --- a/doc/develop/devicetree/control.rst +++ b/doc/develop/devicetree/control.rst @@ -113,9 +113,12 @@ SoC being used via Kconfig and set `DEFAULT_DEVICE_TREE=/` when prompted by Kconfig. However, if `dts/upstream/` hasn't yet received devicetree source file for your -newly added board support then you can add corresponding devicetree source file -as `arch//dts/.dts`. To select that add `# CONFIG_OF_UPSTREAM is not -set` and set `DEFAULT_DEVICE_TREE=` when prompted by Kconfig. +newly added board support then one option is that you can add the corresponding +devicetree source file as `arch//dts/.dts`. To select that add `# +CONFIG_OF_UPSTREAM is not set` and set `DEFAULT_DEVICE_TREE=` when +prompted by Kconfig. Another option is that you can use use the "pick" option of +`dts/update-dts-subtree.sh` mentioned above to bring in the commits that you +need. This should include your CPU or SoC's devicetree file. On top of that any U-Boot specific tweaks (see: :ref:`dttweaks`) can be made for your board. -- cgit v1.2.3