summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2024-12-31 08:08:59 -0600
committerTom Rini <trini@konsulko.com>2024-12-31 08:08:59 -0600
commitc6fd2a1c29ac3626e14557ac58e15883fbc80ac0 (patch)
treeb4b039c70bef3f4f7838c62dd2b93f04058a95c8 /doc
parent08a915719f47cde3deaf65b0c58f24d1458002d2 (diff)
parent4be40460758057b9a85b0303dc072c108813cdf6 (diff)
Merge tag 'v2025.01-rc6' into next
Prepare v2025.01-rc6
Diffstat (limited to 'doc')
-rw-r--r--doc/develop/release_cycle.rst2
-rw-r--r--doc/usage/cmd/rng.rst4
-rw-r--r--doc/usage/fit/kernel_fdt.rst88
3 files changed, 47 insertions, 47 deletions
diff --git a/doc/develop/release_cycle.rst b/doc/develop/release_cycle.rst
index c0e394f77cc..449d0375a1b 100644
--- a/doc/develop/release_cycle.rst
+++ b/doc/develop/release_cycle.rst
@@ -77,7 +77,7 @@ For the next scheduled release, release candidates were made on::
* U-Boot v2025.01-rc5 was released on Mon 23 December 2024.
-.. * U-Boot v2025.01-rc6 was released on Mon 30 December 2024.
+* U-Boot v2025.01-rc6 was released on Mon 30 December 2024.
Please note that the following dates are planned only and may be deviated from
as needed.
diff --git a/doc/usage/cmd/rng.rst b/doc/usage/cmd/rng.rst
index 4a61e33d272..c071f01e841 100644
--- a/doc/usage/cmd/rng.rst
+++ b/doc/usage/cmd/rng.rst
@@ -12,14 +12,14 @@ Synopsis
::
rng list
- rng [dev] [n]
+ rng [dev [n]]
rng list
--------
List all the probed rng devices.
-rng [dev] [n]
+rng [dev [n]]
-------------
The *rng* command reads the random number generator(RNG) device and
diff --git a/doc/usage/fit/kernel_fdt.rst b/doc/usage/fit/kernel_fdt.rst
index 9cc26fb7831..3802c8292d6 100644
--- a/doc/usage/fit/kernel_fdt.rst
+++ b/doc/usage/fit/kernel_fdt.rst
@@ -5,50 +5,50 @@ Single kernel and FDT blob
::
- /dts-v1/;
+ /dts-v1/;
- / {
- description = "Simple image with single Linux kernel and FDT blob";
- #address-cells = <1>;
+ / {
+ description = "Simple image with single Linux kernel and FDT blob";
+ #address-cells = <1>;
- images {
- kernel {
- description = "Vanilla Linux kernel";
- data = /incbin/("./vmlinux.bin.gz");
- type = "kernel";
- arch = "ppc";
- os = "linux";
- compression = "gzip";
- load = <00000000>;
- entry = <00000000>;
- hash-1 {
- algo = "crc32";
- };
- hash-2 {
- algo = "sha256";
- };
- };
- fdt-1 {
- description = "Flattened Device Tree blob";
- data = /incbin/("./target.dtb");
- type = "flat_dt";
- arch = "ppc";
- compression = "none";
- hash-1 {
- algo = "crc32";
- };
- hash-2 {
- algo = "sha256";
- };
- };
- };
+ images {
+ kernel {
+ description = "Vanilla Linux kernel";
+ data = /incbin/("./vmlinux.bin.gz");
+ type = "kernel";
+ arch = "ppc";
+ os = "linux";
+ compression = "gzip";
+ load = <00000000>;
+ entry = <00000000>;
+ hash-1 {
+ algo = "crc32";
+ };
+ hash-2 {
+ algo = "sha256";
+ };
+ };
+ fdt-1 {
+ description = "Flattened Device Tree blob";
+ data = /incbin/("./target.dtb");
+ type = "flat_dt";
+ arch = "ppc";
+ compression = "none";
+ hash-1 {
+ algo = "crc32";
+ };
+ hash-2 {
+ algo = "sha256";
+ };
+ };
+ };
- configurations {
- default = "conf-1";
- conf-1 {
- description = "Boot Linux kernel with FDT blob";
- kernel = "kernel";
- fdt = "fdt-1";
- };
- };
- };
+ configurations {
+ default = "conf-1";
+ conf-1 {
+ description = "Boot Linux kernel with FDT blob";
+ kernel = "kernel";
+ fdt = "fdt-1";
+ };
+ };
+ };