diff options
| author | Tom Rini <[email protected]> | 2024-06-06 08:22:43 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2024-06-06 08:22:43 -0600 |
| commit | d908143b2baa6c3a707e7aed6eb0eca844f73dc9 (patch) | |
| tree | 04da32678ef1e26161cfc9783a2d0be57c82dfe0 /doc/develop/devicetree | |
| parent | 4b992573b34b1586e323e27b177680a6efec1c76 (diff) | |
| parent | 0efc5a9f670144cad7f287711f25c69cba0fde39 (diff) | |
Merge tag 'doc-2024-07-rc5' of https://source.denx.de/u-boot/custodians/u-boot-efi
Documentation:
* Update netconsole examples mentioning stderr.
* Describe what an "fpga" image is in FIT files.
* process.rst: Document device tree resync rules.
Diffstat (limited to 'doc/develop/devicetree')
| -rw-r--r-- | doc/develop/devicetree/control.rst | 9 |
1 files changed, 6 insertions, 3 deletions
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=<vendor>/<name>` 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/<arch>/dts/<name>.dts`. To select that add `# CONFIG_OF_UPSTREAM is not -set` and set `DEFAULT_DEVICE_TREE=<name>` when prompted by Kconfig. +newly added board support then one option is that you can add the corresponding +devicetree source file as `arch/<arch>/dts/<name>.dts`. To select that add `# +CONFIG_OF_UPSTREAM is not set` and set `DEFAULT_DEVICE_TREE=<name>` 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. |