diff options
Diffstat (limited to 'doc/usage')
37 files changed, 368 insertions, 222 deletions
diff --git a/doc/usage/cmd/askenv.rst b/doc/usage/cmd/askenv.rst index a8867ce4d26..0aebc70214f 100644 --- a/doc/usage/cmd/askenv.rst +++ b/doc/usage/cmd/askenv.rst @@ -44,7 +44,7 @@ Value of a environment variable env1 without message and size parameters: => askenv env1 Please enter 'env1': val1 - => printenv env1 + => env print env1 env1=val1 Value of a environment variable env2 with message and size parameters: @@ -53,7 +53,7 @@ Value of a environment variable env2 with message and size parameters: => askenv env2 Please type-in a value for env2: 10 Please type-in a value for env2: 1234567890123 - => printenv env2 + => env print env2 env2=1234567890 Value of a environment variable env3 with size parameter only: @@ -62,7 +62,7 @@ Value of a environment variable env3 with size parameter only: => askenv env3 10 Please enter 'env3': val3 - => printenv env3 + => env print env3 env3=val3 Configuration diff --git a/doc/usage/cmd/bootd.rst b/doc/usage/cmd/bootd.rst index 619cfb601a0..b76930ed929 100644 --- a/doc/usage/cmd/bootd.rst +++ b/doc/usage/cmd/bootd.rst @@ -24,13 +24,13 @@ Example :: - => setenv bootcmd 'echo Hello World' + => env set bootcmd 'echo Hello World' => bootd Hello World - => setenv bootcmd true + => env set bootcmd true => bootd; echo $? 0 - => setenv bootcmd false + => env set bootcmd false => bootd; echo $? 1 diff --git a/doc/usage/cmd/bootefi.rst b/doc/usage/cmd/bootefi.rst index 7c5448586b7..8b237fd75fb 100644 --- a/doc/usage/cmd/bootefi.rst +++ b/doc/usage/cmd/bootefi.rst @@ -48,7 +48,7 @@ or :: - setenv bootargs root=/dev/vda1 + env set bootargs root=/dev/vda1 load mmc 0:1 $fdt_addr_r dtb load mmc 0:1 $kernel_addr_r vmlinux load mmc 0:1 $initrd_addr_r intird @@ -117,7 +117,7 @@ the *bootefi hello* sub-command. A session might look like :: - => setenv bootargs 'Greetings to the world' + => env set bootargs 'Greetings to the world' => bootefi hello Booting /MemoryMapped(0x0,0x10001000,0x1000) Hello, world! @@ -140,7 +140,7 @@ To show a list of the available unit tests the value *list* can be used :: - => setenv efi_selftest list + => env set efi_selftest list => bootefi selftest Available tests: @@ -154,7 +154,7 @@ environment variable to match one of the listed identifiers :: - => setenv efi_selftest 'block image transfer' + => env set efi_selftest 'block image transfer' => bootefi selftest Some of the tests execute the ExitBootServices() UEFI boot service and will not diff --git a/doc/usage/cmd/booti.rst b/doc/usage/cmd/booti.rst index 313efb83cc6..c8e847eae22 100644 --- a/doc/usage/cmd/booti.rst +++ b/doc/usage/cmd/booti.rst @@ -77,8 +77,8 @@ Here is the boot log for the compressed kernel: :: - => setenv kernel_comp_addr_r 0x50000000 - => setenv kernel_comp_size 0x04000000 + => env set kernel_comp_addr_r 0x50000000 + => env set kernel_comp_size 0x04000000 => load mmc 0:1 $fdt_addr_r dtb-5.10.0-3-arm64 27530 bytes read in 6 ms (4.4 MiB/s) => load mmc 0:1 $kernel_addr_r vmlinuz-5.10.0-3-arm64.gz diff --git a/doc/usage/cmd/bootmenu.rst b/doc/usage/cmd/bootmenu.rst index cd5597bc646..e76e6a6cb6c 100644 --- a/doc/usage/cmd/bootmenu.rst +++ b/doc/usage/cmd/bootmenu.rst @@ -75,10 +75,10 @@ to the user. Example environment:: - setenv bootmenu_0 Boot 1. kernel=bootm 0x82000000 # Set first menu entry - setenv bootmenu_1 Boot 2. kernel=bootm 0x83000000 # Set second menu entry - setenv bootmenu_2 Reset board=reset # Set third menu entry - setenv bootmenu_3 U-Boot boot order=boot # Set fourth menu entry + env set bootmenu_0 Boot 1. kernel=bootm 0x82000000 # Set first menu entry + env set bootmenu_1 Boot 2. kernel=bootm 0x83000000 # Set second menu entry + env set bootmenu_2 Reset board=reset # Set third menu entry + env set bootmenu_3 U-Boot boot order=boot # Set fourth menu entry bootmenu 20 # Run bootmenu with autoboot delay 20s diff --git a/doc/usage/cmd/button.rst b/doc/usage/cmd/button.rst index 6c6794f31b8..0b58b91e8da 100644 --- a/doc/usage/cmd/button.rst +++ b/doc/usage/cmd/button.rst @@ -32,7 +32,7 @@ variable *status1* you would execute the commands :: button button1 - setenv status1 $? + env set status1 $? A list of all available buttons and their status can be displayed using diff --git a/doc/usage/cmd/cedit.rst b/doc/usage/cmd/cedit.rst index e54ea204b9f..40eb6a2cb54 100644 --- a/doc/usage/cmd/cedit.rst +++ b/doc/usage/cmd/cedit.rst @@ -75,8 +75,8 @@ cedit write_env Writes the settings to environment variables. For each menu item the selected ID and its text string are written, similar to: - setenv c.<name> <selected_id> - setenv c.<name>-str <selected_id's text string> + env set c.<name> <selected_id> + env set c.<name>-str <selected_id's text string> The `-v` flag enables verbose mode, where each variable is printed before it is set. diff --git a/doc/usage/cmd/config.rst b/doc/usage/cmd/config.rst new file mode 100644 index 00000000000..bd8aa65ddbc --- /dev/null +++ b/doc/usage/cmd/config.rst @@ -0,0 +1,40 @@ +.. SPDX-License-Identifier: GPL-2.0 + +.. index:: + single: config (command) + +config command +============== + +Synopsis +-------- + +:: + + config [<str>] + +Description +----------- + +The config command prints the `.config` file used when building U-Boot +to the console. Note that the `.config` file is usually several 1000 +lines long. + +If the optional argument is given, only lines containing that string +(case insensitively) are printed. That can be useful if one wants to +check whether a specific option is enabled, or just to limit the +output to the subsystem of interest. + +The `.config` file is stored inside the U-Boot binary in +gzip-compressed format. + +Examples +-------- + +.. code-block:: bash + + # Print the entire .config + config + + # Print all lines related to pinctrl + config pinctrl diff --git a/doc/usage/cmd/coninfo.rst b/doc/usage/cmd/coninfo.rst index a66cf90a27b..bbfbebb9dc2 100644 --- a/doc/usage/cmd/coninfo.rst +++ b/doc/usage/cmd/coninfo.rst @@ -36,7 +36,7 @@ Example | |-- stderr |-- serial (IO) |-- usbkbd (I) - => setenv stdin pl011@9000000,usbkbd + => env set stdin pl011@9000000,usbkbd => coninfo List of available devices |-- pl011@9000000 (IO) diff --git a/doc/usage/cmd/echo.rst b/doc/usage/cmd/echo.rst index ebc9ff5f843..b747e4b89ac 100644 --- a/doc/usage/cmd/echo.rst +++ b/doc/usage/cmd/echo.rst @@ -38,7 +38,7 @@ Observe how variables included in strings are handled: :: - => setenv var X; echo "a)" ${var} 'b)' '${var}' c) ${var} + => env set var X; echo "a)" ${var} 'b)' '${var}' c) ${var} a) X b) ${var} c) X => diff --git a/doc/usage/cmd/efi.rst b/doc/usage/cmd/efi.rst index b19d36188a9..62a2638feca 100644 --- a/doc/usage/cmd/efi.rst +++ b/doc/usage/cmd/efi.rst @@ -12,7 +12,7 @@ Synopsis :: - efi mem [all] + efi mem efi tables Description @@ -29,34 +29,26 @@ happened. efi mem ~~~~~~~ -This shows the EFI memory map, sorted in order of physical address. - -This is normally a very large table. To help reduce the amount of detritus, -boot-time memory is normally merged with conventional memory. Use the 'all' -argument to show everything. - -The fields are as follows: - -# - Entry number (sequentially from 0) +This shows the EFI memory map in the same format as the *efidebug memmap* +command. One line is printed per memory region with the following fields: Type - Memory type. EFI has a large number of memory types. The type is shown in - the format <n>:<name> where in is the format number in hex and <name> is the - name. - -Physical - Physical address - -Virtual - Virtual address + Memory type, named as in the UEFI specification without the leading + 'Efi' and the trailing 'Type', e.g. ConventionalMemory for + EfiConventionalMemory. -Size - Size of memory area in bytes +Start, End + Physical start and end address of the region. The virtual addresses of + the regions are not shown: the memory map is identity mapped when this + command can be used, i.e. before SetVirtualAddressMap() is called, so + the virtual address field of the memory map carries no information. Attributes - Shows a code for memory attributes. The key for this is shown below the - table. + The attributes of the region as a '|'-separated list of mnemonics, + e.g. UC for EFI_MEMORY_UC and RT for EFI_MEMORY_RUNTIME. When the + region carries ISA-specific attributes (EFI_MEMORY_ISA_VALID is set), + the ISA-specific field is shown as ISA=<value>. Attribute bits without + a mnemonic are shown as a hexadecimal value. efi tables ~~~~~~~~~~ @@ -72,142 +64,139 @@ Example :: => efi mem - EFI table at 0, memory map 000000001ad38b60, size 1260, key a79, version 1, descr. size 0x30 - # Type Physical Virtual Size Attributes - 0 7:conv 0000000000 0000000000 00000a0000 f - <gap> 00000a0000 0000060000 - 1 7:conv 0000100000 0000000000 0000700000 f - 2 a:acpi_nvs 0000800000 0000000000 0000008000 f - 3 7:conv 0000808000 0000000000 0000008000 f - 4 a:acpi_nvs 0000810000 0000000000 00000f0000 f - 5 7:conv 0000900000 0000000000 001efef000 f - 6 6:rt_data 001f8ef000 0000000000 0000100000 rf - 7 5:rt_code 001f9ef000 0000000000 0000100000 rf - 8 0:reserved 001faef000 0000000000 0000080000 f - 9 9:acpi_reclaim 001fb6f000 0000000000 0000010000 f - 10 a:acpi_nvs 001fb7f000 0000000000 0000080000 f - 11 7:conv 001fbff000 0000000000 0000359000 f - 12 6:rt_data 001ff58000 0000000000 0000020000 rf - 13 a:acpi_nvs 001ff78000 0000000000 0000088000 f - <gap> 0020000000 0090000000 - 14 0:reserved 00b0000000 0000000000 0010000000 1 - - Attributes key: - f: uncached, write-coalescing, write-through, write-back - rf: uncached, write-coalescing, write-through, write-back, needs runtime mapping - 1: uncached - *Some areas are merged (use 'all' to see) - - - => efi mem all - EFI table at 0, memory map 000000001ad38bb0, size 1260, key a79, version 1, descr. size 0x30 - # Type Physical Virtual Size Attributes - 0 3:bs_code 0000000000 0000000000 0000001000 f - 1 7:conv 0000001000 0000000000 000009f000 f - <gap> 00000a0000 0000060000 - 2 7:conv 0000100000 0000000000 0000700000 f - 3 a:acpi_nvs 0000800000 0000000000 0000008000 f - 4 7:conv 0000808000 0000000000 0000008000 f - 5 a:acpi_nvs 0000810000 0000000000 00000f0000 f - 6 4:bs_data 0000900000 0000000000 0000c00000 f - 7 7:conv 0001500000 0000000000 000aa36000 f - 8 2:loader_data 000bf36000 0000000000 0010000000 f - 9 4:bs_data 001bf36000 0000000000 0000020000 f - 10 7:conv 001bf56000 0000000000 00021e1000 f - 11 1:loader_code 001e137000 0000000000 00000c4000 f - 12 7:conv 001e1fb000 0000000000 000009b000 f - 13 1:loader_code 001e296000 0000000000 00000e2000 f - 14 7:conv 001e378000 0000000000 000005b000 f - 15 4:bs_data 001e3d3000 0000000000 000001e000 f - 16 7:conv 001e3f1000 0000000000 0000016000 f - 17 4:bs_data 001e407000 0000000000 0000016000 f - 18 2:loader_data 001e41d000 0000000000 0000002000 f - 19 4:bs_data 001e41f000 0000000000 0000828000 f - 20 3:bs_code 001ec47000 0000000000 0000045000 f - 21 4:bs_data 001ec8c000 0000000000 0000001000 f - 22 3:bs_code 001ec8d000 0000000000 000000e000 f - 23 4:bs_data 001ec9b000 0000000000 0000001000 f - 24 3:bs_code 001ec9c000 0000000000 000002c000 f - 25 4:bs_data 001ecc8000 0000000000 0000001000 f - 26 3:bs_code 001ecc9000 0000000000 000000c000 f - 27 4:bs_data 001ecd5000 0000000000 0000006000 f - 28 3:bs_code 001ecdb000 0000000000 0000014000 f - 29 4:bs_data 001ecef000 0000000000 0000001000 f - 30 3:bs_code 001ecf0000 0000000000 000005b000 f - 31 4:bs_data 001ed4b000 0000000000 000000b000 f - 32 3:bs_code 001ed56000 0000000000 0000024000 f - 33 4:bs_data 001ed7a000 0000000000 0000006000 f - 34 3:bs_code 001ed80000 0000000000 0000010000 f - 35 4:bs_data 001ed90000 0000000000 0000002000 f - 36 3:bs_code 001ed92000 0000000000 0000025000 f - 37 4:bs_data 001edb7000 0000000000 0000003000 f - 38 3:bs_code 001edba000 0000000000 0000011000 f - 39 4:bs_data 001edcb000 0000000000 0000008000 f - 40 3:bs_code 001edd3000 0000000000 000002d000 f - 41 4:bs_data 001ee00000 0000000000 0000201000 f - 42 3:bs_code 001f001000 0000000000 0000024000 f - 43 4:bs_data 001f025000 0000000000 0000002000 f - 44 3:bs_code 001f027000 0000000000 0000009000 f - 45 4:bs_data 001f030000 0000000000 0000005000 f - 46 3:bs_code 001f035000 0000000000 000002f000 f - 47 4:bs_data 001f064000 0000000000 0000001000 f - 48 3:bs_code 001f065000 0000000000 0000005000 f - 49 4:bs_data 001f06a000 0000000000 0000005000 f - 50 3:bs_code 001f06f000 0000000000 0000007000 f - 51 4:bs_data 001f076000 0000000000 0000007000 f - 52 3:bs_code 001f07d000 0000000000 000000d000 f - 53 4:bs_data 001f08a000 0000000000 0000001000 f - 54 3:bs_code 001f08b000 0000000000 0000006000 f - 55 4:bs_data 001f091000 0000000000 0000004000 f - 56 3:bs_code 001f095000 0000000000 000000d000 f - 57 4:bs_data 001f0a2000 0000000000 0000003000 f - 58 3:bs_code 001f0a5000 0000000000 0000026000 f - 59 4:bs_data 001f0cb000 0000000000 0000005000 f - 60 3:bs_code 001f0d0000 0000000000 0000019000 f - 61 4:bs_data 001f0e9000 0000000000 0000004000 f - 62 3:bs_code 001f0ed000 0000000000 0000024000 f - 63 4:bs_data 001f111000 0000000000 0000008000 f - 64 3:bs_code 001f119000 0000000000 000000b000 f - 65 4:bs_data 001f124000 0000000000 0000001000 f - 66 3:bs_code 001f125000 0000000000 0000002000 f - 67 4:bs_data 001f127000 0000000000 0000002000 f - 68 3:bs_code 001f129000 0000000000 0000009000 f - 69 4:bs_data 001f132000 0000000000 0000003000 f - 70 3:bs_code 001f135000 0000000000 0000005000 f - 71 4:bs_data 001f13a000 0000000000 0000003000 f - 72 3:bs_code 001f13d000 0000000000 0000005000 f - 73 4:bs_data 001f142000 0000000000 0000003000 f - 74 3:bs_code 001f145000 0000000000 0000011000 f - 75 4:bs_data 001f156000 0000000000 000000b000 f - 76 3:bs_code 001f161000 0000000000 0000009000 f - 77 4:bs_data 001f16a000 0000000000 0000400000 f - 78 3:bs_code 001f56a000 0000000000 0000006000 f - 79 4:bs_data 001f570000 0000000000 0000001000 f - 80 3:bs_code 001f571000 0000000000 0000001000 f - 81 4:bs_data 001f572000 0000000000 0000002000 f - 82 3:bs_code 001f574000 0000000000 0000017000 f - 83 4:bs_data 001f58b000 0000000000 0000364000 f - 84 6:rt_data 001f8ef000 0000000000 0000100000 rf - 85 5:rt_code 001f9ef000 0000000000 0000100000 rf - 86 0:reserved 001faef000 0000000000 0000080000 f - 87 9:acpi_reclaim 001fb6f000 0000000000 0000010000 f - 88 a:acpi_nvs 001fb7f000 0000000000 0000080000 f - 89 4:bs_data 001fbff000 0000000000 0000201000 f - 90 7:conv 001fe00000 0000000000 00000e8000 f - 91 4:bs_data 001fee8000 0000000000 0000020000 f - 92 3:bs_code 001ff08000 0000000000 0000026000 f - 93 4:bs_data 001ff2e000 0000000000 0000009000 f - 94 3:bs_code 001ff37000 0000000000 0000021000 f - 95 6:rt_data 001ff58000 0000000000 0000020000 rf - 96 a:acpi_nvs 001ff78000 0000000000 0000088000 f - <gap> 0020000000 0090000000 - 97 0:reserved 00b0000000 0000000000 0010000000 1 - - Attributes key: - f: uncached, write-coalescing, write-through, write-back - rf: uncached, write-coalescing, write-through, write-back, needs runtime mapping - 1: uncached - + EFI table at 0, memory map 000000001a977d90, size 1860, key 9e7, version 1, descr. size 0x30 + Type Start End Attributes + ======================= ================ ================ ========== + BootServicesCode 0000000000000000-0000000000001000 UC|WC|WT|WB + ConventionalMemory 0000000000001000-00000000000a0000 UC|WC|WT|WB + ConventionalMemory 0000000000100000-0000000000800000 UC|WC|WT|WB + ACPIMemoryNVS 0000000000800000-0000000000808000 UC|WC|WT|WB + ConventionalMemory 0000000000808000-000000000080b000 UC|WC|WT|WB + ACPIMemoryNVS 000000000080b000-000000000080c000 UC|WC|WT|WB + ConventionalMemory 000000000080c000-0000000000810000 UC|WC|WT|WB + ACPIMemoryNVS 0000000000810000-0000000000900000 UC|WC|WT|WB + BootServicesData 0000000000900000-0000000001780000 UC|WC|WT|WB + ConventionalMemory 0000000001780000-000000000bb75000 UC|WC|WT|WB + LoaderData 000000000bb75000-000000001bb75000 UC|WC|WT|WB + BootServicesData 000000001bb75000-000000001bb95000 UC|WC|WT|WB + ConventionalMemory 000000001bb95000-000000001dd24000 UC|WC|WT|WB + LoaderCode 000000001dd24000-000000001ddfe000 UC|WC|WT|WB + ConventionalMemory 000000001ddfe000-000000001de99000 UC|WC|WT|WB + BootServicesData 000000001de99000-000000001dea9000 UC|WC|WT|WB + LoaderData 000000001dea9000-000000001deac000 UC|WC|WT|WB + BootServicesData 000000001deac000-000000001e58e000 UC|WC|WT|WB + BootServicesCode 000000001e58e000-000000001e642000 UC|WC|WT|WB + BootServicesData 000000001e642000-000000001e672000 UC|WC|WT|WB + BootServicesCode 000000001e672000-000000001e753000 UC|WC|WT|WB + BootServicesData 000000001e753000-000000001e7b8000 UC|WC|WT|WB + BootServicesCode 000000001e7b8000-000000001e7c1000 UC|WC|WT|WB + BootServicesData 000000001e7c1000-000000001e7c6000 UC|WC|WT|WB + BootServicesCode 000000001e7c6000-000000001e7e6000 UC|WC|WT|WB + BootServicesData 000000001e7e6000-000000001e7e8000 UC|WC|WT|WB + BootServicesCode 000000001e7e8000-000000001e7f2000 UC|WC|WT|WB + BootServicesData 000000001e7f2000-000000001e7f3000 UC|WC|WT|WB + BootServicesCode 000000001e7f3000-000000001e7fb000 UC|WC|WT|WB + BootServicesData 000000001e7fb000-000000001e7fc000 UC|WC|WT|WB + BootServicesCode 000000001e7fc000-000000001e80c000 UC|WC|WT|WB + BootServicesData 000000001e80c000-000000001e80f000 UC|WC|WT|WB + BootServicesCode 000000001e80f000-000000001e812000 UC|WC|WT|WB + BootServicesData 000000001e812000-000000001e819000 UC|WC|WT|WB + BootServicesCode 000000001e819000-000000001e82b000 UC|WC|WT|WB + BootServicesData 000000001e82b000-000000001e834000 UC|WC|WT|WB + BootServicesCode 000000001e834000-000000001e842000 UC|WC|WT|WB + BootServicesData 000000001e842000-000000001e851000 UC|WC|WT|WB + BootServicesCode 000000001e851000-000000001e85c000 UC|WC|WT|WB + BootServicesData 000000001e85c000-000000001e867000 UC|WC|WT|WB + BootServicesCode 000000001e867000-000000001e87d000 UC|WC|WT|WB + BootServicesData 000000001e87d000-000000001e886000 UC|WC|WT|WB + BootServicesCode 000000001e886000-000000001e8aa000 UC|WC|WT|WB + BootServicesData 000000001e8aa000-000000001e8ad000 UC|WC|WT|WB + BootServicesCode 000000001e8ad000-000000001e8c1000 UC|WC|WT|WB + BootServicesData 000000001e8c1000-000000001e8c8000 UC|WC|WT|WB + BootServicesCode 000000001e8c8000-000000001e8e1000 UC|WC|WT|WB + BootServicesData 000000001e8e1000-000000001e8e4000 UC|WC|WT|WB + BootServicesCode 000000001e8e4000-000000001e8ea000 UC|WC|WT|WB + BootServicesData 000000001e8ea000-000000001e8ec000 UC|WC|WT|WB + BootServicesCode 000000001e8ec000-000000001e8ff000 UC|WC|WT|WB + BootServicesData 000000001e8ff000-000000001e904000 UC|WC|WT|WB + BootServicesCode 000000001e904000-000000001e91a000 UC|WC|WT|WB + BootServicesData 000000001e91a000-000000001e91c000 UC|WC|WT|WB + BootServicesCode 000000001e91c000-000000001e929000 UC|WC|WT|WB + BootServicesData 000000001e929000-000000001e92c000 UC|WC|WT|WB + BootServicesCode 000000001e92c000-000000001e932000 UC|WC|WT|WB + BootServicesData 000000001e932000-000000001e934000 UC|WC|WT|WB + BootServicesCode 000000001e934000-000000001e935000 UC|WC|WT|WB + BootServicesData 000000001e935000-000000001e936000 UC|WC|WT|WB + BootServicesCode 000000001e936000-000000001e93b000 UC|WC|WT|WB + BootServicesData 000000001e93b000-000000001e940000 UC|WC|WT|WB + BootServicesCode 000000001e940000-000000001e94c000 UC|WC|WT|WB + BootServicesData 000000001e94c000-000000001e94e000 UC|WC|WT|WB + BootServicesCode 000000001e94e000-000000001e96b000 UC|WC|WT|WB + BootServicesData 000000001e96b000-000000001e96c000 UC|WC|WT|WB + BootServicesCode 000000001e96c000-000000001e976000 UC|WC|WT|WB + BootServicesData 000000001e976000-000000001e977000 UC|WC|WT|WB + BootServicesCode 000000001e977000-000000001e978000 UC|WC|WT|WB + BootServicesData 000000001e978000-000000001e97a000 UC|WC|WT|WB + BootServicesCode 000000001e97a000-000000001e98f000 UC|WC|WT|WB + BootServicesData 000000001e98f000-000000001e992000 UC|WC|WT|WB + BootServicesCode 000000001e992000-000000001e994000 UC|WC|WT|WB + BootServicesData 000000001e994000-000000001e996000 UC|WC|WT|WB + BootServicesCode 000000001e996000-000000001e99d000 UC|WC|WT|WB + BootServicesData 000000001e99d000-000000001e9a4000 UC|WC|WT|WB + BootServicesCode 000000001e9a4000-000000001e9a8000 UC|WC|WT|WB + BootServicesData 000000001e9a8000-000000001e9ae000 UC|WC|WT|WB + BootServicesCode 000000001e9ae000-000000001e9b2000 UC|WC|WT|WB + BootServicesData 000000001e9b2000-000000001e9b4000 UC|WC|WT|WB + BootServicesCode 000000001e9b4000-000000001e9ef000 UC|WC|WT|WB + BootServicesData 000000001e9ef000-000000001e9f1000 UC|WC|WT|WB + BootServicesCode 000000001e9f1000-000000001e9f5000 UC|WC|WT|WB + BootServicesData 000000001e9f5000-000000001e9fd000 UC|WC|WT|WB + BootServicesCode 000000001e9fd000-000000001ea00000 UC|WC|WT|WB + BootServicesData 000000001ea00000-000000001ec02000 UC|WC|WT|WB + BootServicesCode 000000001ec02000-000000001ec0a000 UC|WC|WT|WB + BootServicesData 000000001ec0a000-000000001ec0f000 UC|WC|WT|WB + RuntimeServicesData 000000001ec0f000-000000001ecd0000 UC|WC|WT|WB|RT + BootServicesCode 000000001ecd0000-000000001ece5000 UC|WC|WT|WB + BootServicesData 000000001ece5000-000000001ece6000 UC|WC|WT|WB + BootServicesCode 000000001ece6000-000000001ecea000 UC|WC|WT|WB + BootServicesData 000000001ecea000-000000001eced000 UC|WC|WT|WB + BootServicesCode 000000001eced000-000000001ecf6000 UC|WC|WT|WB + BootServicesData 000000001ecf6000-000000001ecf7000 UC|WC|WT|WB + BootServicesCode 000000001ecf7000-000000001ecf8000 UC|WC|WT|WB + BootServicesData 000000001ecf8000-000000001ecfa000 UC|WC|WT|WB + BootServicesCode 000000001ecfa000-000000001ecfd000 UC|WC|WT|WB + BootServicesData 000000001ecfd000-000000001ecfe000 UC|WC|WT|WB + BootServicesCode 000000001ecfe000-000000001ecff000 UC|WC|WT|WB + BootServicesData 000000001ecff000-000000001ed00000 UC|WC|WT|WB + BootServicesCode 000000001ed00000-000000001ed16000 UC|WC|WT|WB + BootServicesData 000000001ed16000-000000001ed17000 UC|WC|WT|WB + BootServicesCode 000000001ed17000-000000001ed19000 UC|WC|WT|WB + BootServicesData 000000001ed19000-000000001ed2c000 UC|WC|WT|WB + BootServicesCode 000000001ed2c000-000000001ed2e000 UC|WC|WT|WB + BootServicesData 000000001ed2e000-000000001f12e000 UC|WC|WT|WB + BootServicesCode 000000001f12e000-000000001f132000 UC|WC|WT|WB + BootServicesData 000000001f132000-000000001f133000 UC|WC|WT|WB + BootServicesCode 000000001f133000-000000001f137000 UC|WC|WT|WB + BootServicesData 000000001f137000-000000001f13d000 UC|WC|WT|WB + BootServicesCode 000000001f13d000-000000001f147000 UC|WC|WT|WB + BootServicesData 000000001f147000-000000001f148000 UC|WC|WT|WB + BootServicesCode 000000001f148000-000000001f14d000 UC|WC|WT|WB + BootServicesData 000000001f14d000-000000001f4ed000 UC|WC|WT|WB + RuntimeServicesData 000000001f4ed000-000000001f5ed000 UC|WC|WT|WB|RT + RuntimeServicesCode 000000001f5ed000-000000001f6ed000 UC|WC|WT|WB|RT + ReservedMemory 000000001f6ed000-000000001f76d000 UC|WC|WT|WB + ACPIReclaimMemory 000000001f76d000-000000001f77f000 UC|WC|WT|WB + ACPIMemoryNVS 000000001f77f000-000000001f7ff000 UC|WC|WT|WB + BootServicesData 000000001f7ff000-000000001fe00000 UC|WC|WT|WB + ConventionalMemory 000000001fe00000-000000001fe77000 UC|WC|WT|WB + BootServicesData 000000001fe77000-000000001fe97000 UC|WC|WT|WB + BootServicesCode 000000001fe97000-000000001feca000 UC|WC|WT|WB + BootServicesData 000000001feca000-000000001fedb000 UC|WC|WT|WB + BootServicesCode 000000001fedb000-000000001fef4000 UC|WC|WT|WB + RuntimeServicesData 000000001fef4000-000000001ff78000 UC|WC|WT|WB|RT + ACPIMemoryNVS 000000001ff78000-0000000020000000 UC|WC|WT|WB + MemoryMappedIO 00000000ffc00000-0000000100000000 UC|RT + ReservedMemory 000000fd00000000-0000010000000000 => efi tables 000000001f8edf98 ee4e5898-3914-4259-9d6e-dc7bd79403cf EFI_LZMA_COMPRESSED diff --git a/doc/usage/cmd/eficonfig.rst b/doc/usage/cmd/eficonfig.rst index 83a3ebf4f0b..e9fc59a93f0 100644 --- a/doc/usage/cmd/eficonfig.rst +++ b/doc/usage/cmd/eficonfig.rst @@ -61,7 +61,7 @@ Auto boot with the UEFI Boot Option To do auto boot according to the UEFI BootOrder variable, add "bootefi bootmgr" entry as a default or first bootmenu entry:: - CONFIG_PREBOOT="setenv bootmenu_0 UEFI Boot Manager=bootefi bootmgr; setenv bootmenu_1 UEFI Maintenance Menu=eficonfig" + CONFIG_PREBOOT="env set bootmenu_0 UEFI Boot Manager=bootefi bootmgr; env set bootmenu_1 UEFI Maintenance Menu=eficonfig" UEFI Secure Boot Configuration '''''''''''''''''''''''''''''' @@ -84,7 +84,7 @@ If CONFIG_BOOTMENU_DISABLE_UBOOT_CONSOLE is enabled, the user can not enter U-Boot console. In this case, the bootmenu can be used to invoke "eficonfig":: CONFIG_USE_PREBOOT=y - CONFIG_PREBOOT="setenv bootmenu_0 UEFI Maintenance Menu=eficonfig" + CONFIG_PREBOOT="env set bootmenu_0 UEFI Maintenance Menu=eficonfig" The only way U-Boot can currently store EFI variables on a tamper resistant medium is via OP-TEE. The Kconfig option that enables that is:: diff --git a/doc/usage/cmd/exit.rst b/doc/usage/cmd/exit.rst index 2f250bf4bde..b41ca35ff17 100644 --- a/doc/usage/cmd/exit.rst +++ b/doc/usage/cmd/exit.rst @@ -19,8 +19,8 @@ If scripts are nested, only the innermost script is left. :: - => setenv inner 'echo entry inner; exit; echo inner done' - => setenv outer 'echo entry outer; run inner; echo outer done' + => env set inner 'echo entry inner; exit; echo inner done' + => env set outer 'echo entry outer; run inner; echo outer done' => run outer entry outer entry inner diff --git a/doc/usage/cmd/extension.rst b/doc/usage/cmd/extension.rst index fbe95aace79..97c48bfd78e 100644 --- a/doc/usage/cmd/extension.rst +++ b/doc/usage/cmd/extension.rst @@ -62,8 +62,8 @@ Usage example :: - => setenv extension_overlay_addr 0x88080000 - => setenv extension_overlay_cmd 'load mmc 0:1 ${extension_overlay_addr} /boot/${extension_overlay_name}' + => env set extension_overlay_addr 0x88080000 + => env set extension_overlay_cmd 'load mmc 0:1 ${extension_overlay_addr} /boot/${extension_overlay_name}' 3. Detect the plugged extension board diff --git a/doc/usage/cmd/for.rst b/doc/usage/cmd/for.rst index 729bd4db43c..3db3410a171 100644 --- a/doc/usage/cmd/for.rst +++ b/doc/usage/cmd/for.rst @@ -34,14 +34,14 @@ Example :: - => setenv c + => env set c => for c in 1 2 3; do echo item ${c}; done item 1 item 2 item 3 => echo ${c} 3 - => setenv c x + => env set c x => for c in 1 2 3; do echo item ${c}; done item x item x diff --git a/doc/usage/cmd/gpt.rst b/doc/usage/cmd/gpt.rst index 13e8783be9b..6afc634eb0a 100644 --- a/doc/usage/cmd/gpt.rst +++ b/doc/usage/cmd/gpt.rst @@ -179,7 +179,7 @@ Examples Create 6 partitions on a disk:: - => setenv gpt_parts 'uuid_disk=bec9fc2a-86c1-483d-8a0e-0109732277d7;\ + => env set gpt_parts 'uuid_disk=bec9fc2a-86c1-483d-8a0e-0109732277d7;\ name=boot,start=4M,size=128M,bootable,type=ebd0a0a2-b9e5-4433-87c0-68b6b72699c7;\ name=rootfs,size=3072M,type=0fc63daf-8483-4772-8e79-3d69d8477de4;\ name=system-data,size=512M,type=0fc63daf-8483-4772-8e79-3d69d8477de4;\ @@ -249,7 +249,7 @@ Swap the order of the 'boot' and 'rootfs' partition table entries:: Other example: a disk with known partition types:: - => setenv gpt_parts 'name=u-boot,size=32M,type=data;\ + => env set gpt_parts 'name=u-boot,size=32M,type=data;\ name=env,size=1M,type=u-boot-env; name=ESP,size=128M,type=system; name=rootfs,size=3072M,type=linux; diff --git a/doc/usage/cmd/imxtract.rst b/doc/usage/cmd/imxtract.rst index 1621a4a68b2..c631e328569 100644 --- a/doc/usage/cmd/imxtract.rst +++ b/doc/usage/cmd/imxtract.rst @@ -52,7 +52,7 @@ extraction. But correct hashes are still indicated in the output .. code-block:: console - => setenv verify no + => env set verify no => imxtract $loadaddr kernel-1 $kernel_addr_r ## Copying 'kernel-1' subimage from FIT image at 40200000 ... sha256+ sha512+ Loading part 0 ... OK @@ -62,7 +62,7 @@ With verify=yes incorrect hashes, signatures, or check sums stop the extraction. .. code-block:: console - => setenv verify yes + => env set verify yes => imxtract $loadaddr kernel-1 $kernel_addr_r ## Copying 'kernel-1' subimage from FIT image at 40200000 ... sha256 error! diff --git a/doc/usage/cmd/load.rst b/doc/usage/cmd/load.rst index bfa45c6f36c..bf2fffbed21 100644 --- a/doc/usage/cmd/load.rst +++ b/doc/usage/cmd/load.rst @@ -63,6 +63,39 @@ Example 16 bytes read in 1 ms (15.6 KiB/s) => +Null-block-device interfaces +---------------------------- + +A few ``<interface>`` values have no underlying block device. Their +filesystem implementations directly call a back-end (JTAG +debugger, UBI volume, host running U-Boot under sandbox, ...) and +ignore the ``<dev[:part]>`` field, which may be given as ``-``. So +``load <iface> - <addr> <filename>`` works. + +semihosting + Read files from the host filesystem of an attached JTAG debugger + using the ARM semihosting protocol. Useful with OpenOCD. + Built when ``CONFIG_SEMIHOSTING=y``. + +ubifs + Read files from a UBIFS volume that has already been attached + and mounted with the ``ubi part`` + ``ubifsmount`` commands. + Built when ``CONFIG_CMD_UBIFS=y``. + +sandbox + Read files from the host filesystem the sandbox binary is + running under. Available on sandbox builds. + +The ``<dev[:part]>`` argument is conventionally written as ``-`` for +these interfaces, to make it visible at the call site that the field +is unused. The filesystem layer never looks at it. + +Example:: + + => load semihosting - ${kernel_addr_r} kernel.itb + 9437184 bytes read in 412 ms (21.8 MiB/s) + => + Configuration ------------- diff --git a/doc/usage/cmd/mbr.rst b/doc/usage/cmd/mbr.rst index 925a1181055..351959c5097 100644 --- a/doc/usage/cmd/mbr.rst +++ b/doc/usage/cmd/mbr.rst @@ -43,7 +43,7 @@ volume'), some of the predefined sizes: :: - => setenv mbr_parts 'name=boot,start=4M,size=128M,bootable,id=0x0e; + => env set mbr_parts 'name=boot,start=4M,size=128M,bootable,id=0x0e; name=rootfs,size=3072M,id=0x83; name=system-data,size=512M,id=0x83; name=[ext],size=-,id=0x05; diff --git a/doc/usage/cmd/memsize.rst b/doc/usage/cmd/memsize.rst index 6e99d7c1d33..9ebeefc58fa 100644 --- a/doc/usage/cmd/memsize.rst +++ b/doc/usage/cmd/memsize.rst @@ -34,7 +34,7 @@ This second example shows assign ram size to environment variable: :: => memsize memsz - => printenv memsz + => env print memsz memsz=8192 Return value diff --git a/doc/usage/cmd/printenv.rst b/doc/usage/cmd/printenv.rst index dfdb3624934..08c63d7e885 100644 --- a/doc/usage/cmd/printenv.rst +++ b/doc/usage/cmd/printenv.rst @@ -44,7 +44,7 @@ environment variables: :: - => setenv .foo bar + => env set .foo bar => printenv arch=sandbox baudrate=115200 diff --git a/doc/usage/cmd/saves.rst b/doc/usage/cmd/saves.rst index d429eeceddf..c4470b61722 100644 --- a/doc/usage/cmd/saves.rst +++ b/doc/usage/cmd/saves.rst @@ -72,7 +72,7 @@ the offset used in the *saves* command. Really kill this window [y/n] $ srec_cat out.srec -offset -1337982976 -Output out.txt -binary 2>/dev/null $ cat out.txt - setenv autoload no + env set autoload no dhcp load mmc 0:1 $fdt_addr_r dtb load mmc 0:1 $kernel_addr_r snp.efi diff --git a/doc/usage/cmd/sntp.rst b/doc/usage/cmd/sntp.rst index 433884f18b2..bfbf75464c2 100644 --- a/doc/usage/cmd/sntp.rst +++ b/doc/usage/cmd/sntp.rst @@ -43,7 +43,7 @@ Examples :: - => setenv ntpserverip 109.190.177.205 + => env set ntpserverip 109.190.177.205 => date Date: 2025-06-16 (Monday) Time: 15:19:35 => date reset @@ -55,7 +55,7 @@ Examples Date: 2025-06-16 Time: 15:19:43 => date Date: 2025-06-16 (Monday) Time: 15:19:47 - => setenv timeoffset 7200 + => env set timeoffset 7200 => sntp Date: 2025-06-16 Time: 17:19:55 => date diff --git a/doc/usage/cmd/tftpput.rst b/doc/usage/cmd/tftpput.rst index bdffa3af463..3704fdc9896 100644 --- a/doc/usage/cmd/tftpput.rst +++ b/doc/usage/cmd/tftpput.rst @@ -48,7 +48,7 @@ In the example the following steps are executed: :: - => setenv autoload no + => env set autoload no => dhcp BOOTP broadcast 1 DHCP client bound to address 192.168.1.40 (7 ms) diff --git a/doc/usage/cmd/tftpsrv.rst b/doc/usage/cmd/tftpsrv.rst new file mode 100644 index 00000000000..d067afdba57 --- /dev/null +++ b/doc/usage/cmd/tftpsrv.rst @@ -0,0 +1,73 @@ +.. SPDX-License-Identifier: GPL-2.0+ + +.. index:: + single: tftpsrv (command) + +tftpsrv command +=============== + +Synopsis +-------- + +:: + + tftpsrv [loadAddress] + +Description +----------- + +The tftpsrv command listens for an incoming TFTP write request and receives +the first transferred file into memory. + +loadAddress + memory address where the received file is stored. If not provided, the + address is taken from the *loadaddr* environment variable or the default + image load address. + +After a successful transfer, the *fileaddr* and *filesize* environment +variables describe the received file. The command returns successfully after +the transfer has completed. It does not boot the file automatically; boot +scripts can use commands such as bootm, booti or bootefi to boot from the +load address. + +The transfer is aborted if no transfer has started after about 50 seconds or +if Ctrl-C is pressed. + +Example +------- + +In the example the following steps are executed: + +* setup the board network address +* receive a FIT image from a host +* boot the received FIT image + +:: + + => setenv autoload no + => dhcp + BOOTP broadcast 1 + DHCP client bound to address 192.168.1.40 (7 ms) + => tftpsrv $loadaddr + Using ethernet@1c30000 device + Listening for TFTP transfer on 192.168.1.40 + Load address: 0x42000000 + Loading: ################################################################# + 6.5 MiB/s + done + Bytes transferred = 1048576 (100000 hex) + => bootm $fileaddr + +On the host, send the file to the board while U-Boot is listening: + +:: + + $ curl --upload-file image.fit tftp://192.168.1.40/image.fit + +Configuration +------------- + +The command is only available if CONFIG_CMD_TFTPSRV=y. + +The command is supported by both the legacy network stack and the lwIP network +stack. diff --git a/doc/usage/cmd/wget.rst b/doc/usage/cmd/wget.rst index f661d739a19..e6c33b87431 100644 --- a/doc/usage/cmd/wget.rst +++ b/doc/usage/cmd/wget.rst @@ -95,7 +95,7 @@ In the example the following steps are executed: :: - => setenv autoload no + => env set autoload no => dhcp BOOTP broadcast 1 *** Unhandled DHCP Option in OFFER/ACK: 23 diff --git a/doc/usage/cmdline.rst b/doc/usage/cmdline.rst index 79b9baf7bfe..dac6dcccfb7 100644 --- a/doc/usage/cmdline.rst +++ b/doc/usage/cmdline.rst @@ -20,11 +20,11 @@ This takes very little code space and offers only basic features: - special characters ('$', ';') can be escaped by prefixing with '\', for example:: - setenv bootcmd bootm \${address} + env set bootcmd bootm \${address} - You can also escape text by enclosing in single apostrophes, for example:: - setenv addip 'setenv bootargs $bootargs ip=$ipaddr:$serverip:$gatewayip:$netmask:$hostname::off' + env set addip 'env set bootargs $bootargs ip=$ipaddr:$serverip:$gatewayip:$netmask:$hostname::off' Hush shell ---------- @@ -36,7 +36,7 @@ This is similar to Bourne shell, with control structures like: - `while` ... `do` ... `done` - `until` ... `do` ... `done` -Hush supports environment ("global") variables (through setenv / saveenv +Hush supports environment ("global") variables (through env set / saveenv commands) and local shell variables (through standard shell syntax `name=value`); only environment variables can be used with the "run" command diff --git a/doc/usage/dfu.rst b/doc/usage/dfu.rst index af805514b26..987f287b483 100644 --- a/doc/usage/dfu.rst +++ b/doc/usage/dfu.rst @@ -162,8 +162,8 @@ mmc layout and even set a new *dfu_alt_info* for the newly created partitions. Such a script would look like:: - setenv dfu_alt_info ... - setenv mbr_parts ... + env set dfu_alt_info ... + env set mbr_parts ... mbr write ... Please note that this means the user will be able to execute any @@ -334,7 +334,7 @@ When U-Boot runs the dfu stack, the DFU host tools can be used to send/receive firmware images on each configured alternate. For example dfu-util is a host side implementation of the DFU 1.1 -specifications(http://dfu-util.sourceforge.net/) which works with U-Boot. +specifications(https://dfu-util.sourceforge.net/) which works with U-Boot. Usage ----- diff --git a/doc/usage/environment.rst b/doc/usage/environment.rst index 0143f81f2c0..80498853336 100644 --- a/doc/usage/environment.rst +++ b/doc/usage/environment.rst @@ -70,10 +70,10 @@ Example:: /* U-Boot script for booting */ if [ -z ${tftpserverip} ]; then - echo "Use 'setenv tftpserverip a.b.c.d' to set IP address." + echo "Use 'env set tftpserverip a.b.c.d' to set IP address." fi - usb start; setenv autoload n; bootp; + usb start; env set autoload n; bootp; tftpboot ${tftpserverip}: bootm failed= @@ -263,7 +263,7 @@ initrd_high sure that the initrd image is placed in the first 12 MB as well - this can be done with:: - setenv initrd_high 00c00000 + env set initrd_high 00c00000 If you set initrd_high to 0xffffffff (32-bit machines) or 0xffffffffffffffff (64-bit machines), this is an @@ -310,9 +310,9 @@ ethact controls which interface is currently active. For example you can do the following:: - => setenv ethact FEC + => env set ethact FEC => ping 192.168.0.1 # traffic sent on FEC - => setenv ethact SCC + => env set ethact SCC => ping 10.0.0.1 # traffic sent on SCC ethrotate diff --git a/doc/usage/fdt_overlays.rst b/doc/usage/fdt_overlays.rst index 730cb85b39a..81e9512658a 100644 --- a/doc/usage/fdt_overlays.rst +++ b/doc/usage/fdt_overlays.rst @@ -88,8 +88,8 @@ Manually Loading and Applying Overlays :: - => setenv fdtaddr 0x87f00000 - => setenv fdtovaddr 0x87fc0000 + => env set fdtaddr 0x87f00000 + => env set fdtovaddr 0x87fc0000 2. Load the base binary device-tree and the binary device-tree overlay. diff --git a/doc/usage/fit/beaglebone_vboot.rst b/doc/usage/fit/beaglebone_vboot.rst index b15399441ee..c587b8c271d 100644 --- a/doc/usage/fit/beaglebone_vboot.rst +++ b/doc/usage/fit/beaglebone_vboot.rst @@ -518,13 +518,13 @@ Here the card is /dev/sde:: Boot the board using the commands below:: - setenv bootargs console=ttyO0,115200n8 quiet root=/dev/mmcblk0p2 ro rootfstype=ext4 rootwait + env set bootargs console=ttyO0,115200n8 quiet root=/dev/mmcblk0p2 ro rootfstype=ext4 rootwait ext2load mmc 0:2 82000000 /boot/image.fit bootm 82000000 You should then see something like this:: - U-Boot# setenv bootargs console=ttyO0,115200n8 quiet root=/dev/mmcblk0p2 ro rootfstype=ext4 rootwait + U-Boot# env set bootargs console=ttyO0,115200n8 quiet root=/dev/mmcblk0p2 ro rootfstype=ext4 rootwait U-Boot# ext2load mmc 0:2 82000000 /boot/image.fit 7824930 bytes read in 589 ms (12.7 MiB/s) U-Boot# bootm 82000000 diff --git a/doc/usage/fit/dm-verity.rst b/doc/usage/fit/dm-verity.rst index 800a18fceae..76030c751ae 100644 --- a/doc/usage/fit/dm-verity.rst +++ b/doc/usage/fit/dm-verity.rst @@ -209,6 +209,11 @@ typically be obtained from its output. The ``digest`` and ``salt`` byte arrays correspond to the hex-encoded ``Root hash`` and ``Salt`` printed by ``veritysetup format``. +When the configuration is signed, ``digest`` and ``salt`` are covered by +the configuration signature (see :doc:`signature`), so the roothash +cannot be swapped out for a matching one without invalidating the +signature. + Optional boolean properties (when present, they are collected and appended as dm-verity optional parameters with hyphens converted to underscores): diff --git a/doc/usage/fit/howto.rst b/doc/usage/fit/howto.rst index 9c8d86e50be..9c5f989bd75 100644 --- a/doc/usage/fit/howto.rst +++ b/doc/usage/fit/howto.rst @@ -197,9 +197,9 @@ specific to the new image format). [on the target system]:: => print nfsargs - nfsargs=setenv bootargs root=/dev/nfs rw nfsroot=${serverip}:${rootpath} + nfsargs=env set bootargs root=/dev/nfs rw nfsroot=${serverip}:${rootpath} => print addip - addip=setenv bootargs ${bootargs} ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}:${netdev}:off panic=1 + addip=env set bootargs ${bootargs} ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}:${netdev}:off panic=1 => run nfsargs addip => tftp 900000 /path/to/tftp/location/kernel.itb Using FEC device diff --git a/doc/usage/fit/overlay-fdt-boot.rst b/doc/usage/fit/overlay-fdt-boot.rst index 5df304047c6..e210619a26d 100644 --- a/doc/usage/fit/overlay-fdt-boot.rst +++ b/doc/usage/fit/overlay-fdt-boot.rst @@ -111,6 +111,12 @@ Where config is one of:: This selects the DTB to use when booting. +If no configuration is given, U-Boot picks one automatically: with +``CONFIG_FIT_BEST_MATCH`` it selects the configuration whose fdt is the most +compatible with U-Boot's own control devicetree, and falls back to the +``default`` configuration otherwise. When several configurations match +equally well, the ``default`` one is preferred. + .. _fit_configuration_using_overlays: Configuration using overlays diff --git a/doc/usage/fit/signature.rst b/doc/usage/fit/signature.rst index da08cc75c3a..64bada2f58f 100644 --- a/doc/usage/fit/signature.rst +++ b/doc/usage/fit/signature.rst @@ -359,7 +359,7 @@ however, U-Boot does not read 'hashed-nodes'. Instead it rebuilds the node list from the configuration's own image references (kernel, fdt, ramdisk, etc.), since 'hashed-nodes' is not itself covered by the signature. The rebuilt list always includes the root node, the configuration node, each -referenced image node and its hash/cipher subnodes. +referenced image node and its hash, cipher and dm-verity subnodes. The image is walked in order and each tag processed as follows: diff --git a/doc/usage/os/plan9.rst b/doc/usage/os/plan9.rst index f91712c0094..27020be65da 100644 --- a/doc/usage/os/plan9.rst +++ b/doc/usage/os/plan9.rst @@ -19,4 +19,4 @@ If no command line arguments or bootargs are defined, CONFADDR is left uninitialized to permit manual configuration. For example, PC-style configuration could be simulated by issuing a fatload in bootcmd:: - # setenv bootcmd fatload mmc 0 $confaddr plan9.ini; ...; bootm + # env set bootcmd fatload mmc 0 $confaddr plan9.ini; ...; bootm diff --git a/doc/usage/pxe.rst b/doc/usage/pxe.rst index 18532f182d5..523bf9f565e 100644 --- a/doc/usage/pxe.rst +++ b/doc/usage/pxe.rst @@ -30,7 +30,7 @@ Commands try. The order and contents of paths it tries mirrors exactly that of PXELINUX - you can read in more detail about it at: - http://syslinux.zytor.com/wiki/index.php/Doc/pxelinux + https://wiki.syslinux.org/wiki/index.php?title=Doc/pxelinux ``pxe boot`` **Syntax:** ``pxe boot [pxefile_addr_r]`` @@ -130,7 +130,7 @@ pxe file format --------------- The pxe file format is nearly a subset of the PXELINUX file format; -see http://syslinux.zytor.com/wiki/index.php/PXELINUX. It's composed +see https://wiki.syslinux.org/wiki/index.php?title=PXELINUX. It's composed of one line commands - global commands, and commands specific to labels. Lines beginning with # are treated as comments. White space between and at the beginning of lines is ignored. |