diff options
| author | Tom Rini <[email protected]> | 2023-02-27 17:28:21 -0500 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2023-02-27 17:28:21 -0500 |
| commit | 5b197eee334bdf75cc9e9148161299679a5251ea (patch) | |
| tree | edec3c21a01fb54d764d04caa2bd774823e76c2d /doc/develop | |
| parent | 7a826ded4a0e409d73ff4a910685821d34f1b664 (diff) | |
| parent | e8c80ac0f7a13bf0fc016ce324b870c0cff7a2b8 (diff) | |
Merge tag 'v2023.04-rc3' into next
Prepare v2023.04-rc3
Diffstat (limited to 'doc/develop')
| -rw-r--r-- | doc/develop/devicetree/dt_qemu.rst | 4 | ||||
| -rw-r--r-- | doc/develop/release_cycle.rst | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/doc/develop/devicetree/dt_qemu.rst b/doc/develop/devicetree/dt_qemu.rst index c25c4fb053d..8ba2b225590 100644 --- a/doc/develop/devicetree/dt_qemu.rst +++ b/doc/develop/devicetree/dt_qemu.rst @@ -13,7 +13,7 @@ When `CONFIG_OF_BOARD` is enabled Obtaining the QEMU devicetree ----------------------------- -Where QEMU generates its own devicetree to pass to U-Boot tou can use +Where QEMU generates its own devicetree to pass to U-Boot you can use `-dtb u-boot.dtb` to force QEMU to use U-Boot's in-tree version. To obtain the devicetree that qemu generates, add `-machine dumpdtb=qemu.dtb`, @@ -38,7 +38,7 @@ to produce a text file. It drops the duplicate header on the qemu one. Then it joins them up and runs them through dtc to compile the output:: qemu-system-arm -machine virt -machine dumpdtb=qemu.dtb - cat <(dtc -I dtb qemu.dtb) <(dtc -I dtb u-boot.dtb |grep -v /dts-v1/) |dtc - -o merged.dtb + cat <(dtc -I dtb qemu.dtb) <(dtc -I dtb u-boot.dtb | grep -v /dts-v1/) | dtc - -o merged.dtb You can then run qemu with the merged devicetree, e.g.:: diff --git a/doc/develop/release_cycle.rst b/doc/develop/release_cycle.rst index 2809d959850..80b50be90e5 100644 --- a/doc/develop/release_cycle.rst +++ b/doc/develop/release_cycle.rst @@ -68,7 +68,7 @@ For the next scheduled release, release candidates were made on:: * U-Boot v2023.04-rc2 was released on Mon 13 February 2023. -.. * U-Boot v2023.04-rc3 was released on Mon 27 February 2023. +* U-Boot v2023.04-rc3 was released on Mon 27 February 2023. .. * U-Boot v2023.04-rc4 was released on Mon 13 March 2023. |