diff options
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/board/emulation/qemu-riscv.rst | 26 | ||||
| -rw-r--r-- | doc/develop/spl.rst | 2 | ||||
| -rw-r--r-- | doc/git-mailrc | 2 | ||||
| -rw-r--r-- | doc/usage/cmd/bootefi.rst | 37 |
4 files changed, 58 insertions, 9 deletions
diff --git a/doc/board/emulation/qemu-riscv.rst b/doc/board/emulation/qemu-riscv.rst index cf2f893b723..b5948d9affc 100644 --- a/doc/board/emulation/qemu-riscv.rst +++ b/doc/board/emulation/qemu-riscv.rst @@ -179,6 +179,32 @@ Provide the U-Boot S-mode ELF image as *-kernel* parameter and do not add a qemu-system-riscv64 -accel kvm -nographic -machine virt -kernel u-boot +Running as flash binary +----------------------- + +U-Boot can be provided to QEMU as an emulated flash drive. +This can for instance be used to test capsule updates. + +Build qemu-riscv64_smode_defconfig with:: + + CONFIG_XIP=y + CONFIG_TEXT_BASE=0x20000000 + CONFIG_CMD_MTD=y + CONFIG_FLASH_CFI_MTD=y + +Pad u-boot.bin to 32 MiB size: + +.. code-block:: bash + + truncate -s 32M u-boot.bin + +Invoke QEMU with: + +.. code-block:: bash + + qemu-system-riscv64 -M virt -nographic \ + -drive if=pflash,format=raw,unit=0,file=u-boot.bin,readonly=off + Debug UART ---------- diff --git a/doc/develop/spl.rst b/doc/develop/spl.rst index aa6d28fa333..7f2eac50806 100644 --- a/doc/develop/spl.rst +++ b/doc/develop/spl.rst @@ -142,7 +142,7 @@ fdtgrep is also used to remove: - the properties defined in CONFIG_OF_SPL_REMOVE_PROPS - all the pre-relocation properties ('bootph-all', 'bootph-pre-ram' (SPL), 'bootph-pre-sram' (TPL) and - 'bootph-verify' (TPL)) + 'bootph-verify' (VPL)) All the nodes remaining in the SPL devicetree are bound (see doc/driver-model/design.rst). diff --git a/doc/git-mailrc b/doc/git-mailrc index 747ceda3307..65626d89eac 100644 --- a/doc/git-mailrc +++ b/doc/git-mailrc @@ -23,7 +23,7 @@ alias bmeng Bin Meng <bmeng.cn@gmail.com> alias danielschwierzeck Daniel Schwierzeck <daniel.schwierzeck@gmail.com> alias dinh Dinh Nguyen <dinguyen@kernel.org> alias ehristev Eugen Hristev <eugen.hristev@linaro.org> -alias hs Heiko Schocher <hs@denx.de> +alias hs Heiko Schocher <hs@nabladev.com> alias freenix Peng Fan <peng.fan@nxp.com> alias iwamatsu Nobuhiro Iwamatsu <iwamatsu@nigauri.org> alias jaehoon Jaehoon Chung <jh80.chung@samsung.com> diff --git a/doc/usage/cmd/bootefi.rst b/doc/usage/cmd/bootefi.rst index d6e4e62e383..7c5448586b7 100644 --- a/doc/usage/cmd/bootefi.rst +++ b/doc/usage/cmd/bootefi.rst @@ -12,7 +12,7 @@ Synopsis :: - bootefi <image_addr>[:<image_size>] [<fdt_addr>] + bootefi <image_addr>[:<image_size>] [<initrd_addr>:<initrd_size>] [<fdt_address>] bootefi bootmgr [<fdt_addr>] bootefi hello [<fdt_addr>] bootefi selftest [<fdt_addr>] @@ -44,6 +44,16 @@ command sequence to run a UEFI application might look like load mmc 0:1 $kernel_addr_r /EFI/grub/grubaa64.efi bootefi $kernel_addr_r $fdt_addr_r +or + +:: + + setenv 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 + bootefi $kernel_addr_r $initrd_addr_r:$filesize $fdt_addr_r + The last UEFI binary loaded defines the image file path in the loaded image protocol. @@ -51,21 +61,34 @@ The value of the environment variable *bootargs* is converted from UTF-8 to UTF-16 and passed as load options in the loaded image protocol to the UEFI binary. +.. note:: + + The bootefi command accepts one to three arguments. + If the second argument contains a colon ':', it is assumed to specify the + initial RAM disk. + image_addr Address of the UEFI binary. -fdt_addr - Address of the device-tree or '-'. If no address is specifiy, the - environment variable $fdt_addr is used as first fallback, the address of - U-Boot's internal device-tree $fdtcontroladdr as second fallback. - When using ACPI no device-tree shall be specified. - image_size Size of the UEFI binary file. This argument is only needed if *image_addr* does not match the address of the last loaded UEFI binary. In this case a memory device path will be used as image file path in the loaded image protocol. +initrd_addr + Address of the Linux initial RAM disk or '-'. If no address is specified, + no RAM disk is used when booting. + +initrd_size + Size of the Linux initial RAM disk. + +fdt_addr + Address of the device-tree or '-'. If no address is specified, the + environment variable $fdt_addr is used as first fallback, the address of + U-Boot's internal device-tree $fdtcontroladdr as second fallback. + When using ACPI no device-tree shall be specified. + Note UEFI binaries that are contained in FIT images are launched via the *bootm* command. |