Merge tag 'dm-pull-9jul19-take2' of https://gitlab.denx.de/u-boot/custodians/u-boot-dm

[oweals/u-boot.git] / doc / device-tree-bindings / config.txt

diff --git a/doc/device-tree-bindings/config.txt b/doc/device-tree-bindings/config.txt
index 5640bae72fc71d4673208b8938035b51dec3c1eb..6cdc16da5b51ee3cc8f2bcf873543227b4098921 100644 (file)
--- a/doc/device-tree-bindings/config.txt
+++ b/doc/device-tree-bindings/config.txt
@@ -20,3 +20,35 @@ u-boot,efi-partition-entries-offset
        is formatted.
 
        This setting will override any values configured via Kconfig.
+
+u-boot,mmc-env-partition
+       if present, the environment shall be placed at the last
+       CONFIG_ENV_SIZE blocks of the partition on the
+       CONFIG_SYS_MMC_ENV_DEV.
+
+       if u-boot,mmc-env-offset* is present, this setting will take
+       precedence. In that case, only if the partition is not found,
+       mmc-env-offset* will be tried.
+
+u-boot,mmc-env-offset
+u-boot,mmc-env-offset-redundant
+       If present, the values of the 'u-boot,mmc-env-offset' and/or
+       of the u-boot,mmc-env-offset-redundant' properties overrides
+       CONFIG_ENV_OFFSET and CONFIG_ENV_OFFSET_REDUND, respectively,
+       for SD/MMC devices.
+
+       Values are interpreted as the offset from the start of the
+       device, specified in bytes.  It is assumed that the setting
+       will point at the beginning of a LBA and values that are not
+       LBA-aligned will be rounded up to the next LBA address.
+
+u-boot,spl-payload-offset
+       If present (and SPL is controlled by the device-tree), this allows
+       to override the CONFIG_SYS_SPI_U_BOOT_OFFS setting using a value
+       from the device-tree.
+
+sysreset-gpio
+       If present (and supported by the specific board), indicates a
+       GPIO that can be set to trigger a system reset.  It is assumed
+       that such a system reset will effect a complete platform reset,
+       being roughly equivalent to a power-on reset.