diff options
| author | Sandrine Bailleux <sandrine.bailleux@arm.com> | 2020-02-03 09:20:29 +0000 |
|---|---|---|
| committer | TrustedFirmware Code Review <review@review.trustedfirmware.org> | 2020-02-03 09:20:29 +0000 |
| commit | 9db293d1f1d43d5a2838fc57e23e59c05c1ce76d (patch) | |
| tree | e5194dfe0c55895d8bdfbba419151829c649d686 | |
| parent | 989429e8726e55bac78292ead4400649350c4565 (diff) | |
| parent | 62038be731dbb94b27bd571caeead070e9597344 (diff) | |
| download | platform_external_arm-trusted-firmware-9db293d1f1d43d5a2838fc57e23e59c05c1ce76d.tar.gz platform_external_arm-trusted-firmware-9db293d1f1d43d5a2838fc57e23e59c05c1ce76d.tar.bz2 platform_external_arm-trusted-firmware-9db293d1f1d43d5a2838fc57e23e59c05c1ce76d.zip | |
Merge "doc: qemu: fix and update documentation" into integration
| -rw-r--r-- | docs/plat/qemu.rst | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/docs/plat/qemu.rst b/docs/plat/qemu.rst index a4c5bec71..88196bc93 100644 --- a/docs/plat/qemu.rst +++ b/docs/plat/qemu.rst @@ -14,7 +14,7 @@ If ``ARM_LINUX_KERNEL_AS_BL33`` is set to 1 then this FDT will be passed to BL33 via register x0, as expected by a Linux kernel. This allows a Linux kernel image to be booted directly as BL33 rather than using a bootloader. -An ARM64 defconfig v4.5 Linux kernel is known to boot, FDT doesn't need to be +An ARM64 defconfig v5.5 Linux kernel is known to boot, FDT doesn't need to be provided as it's generated by QEMU. Current limitations: @@ -24,7 +24,7 @@ Current limitations: - No instructions for how to load a BL32 (Secure Payload) ``QEMU_EFI.fd`` can be dowloaded from -http://snapshots.linaro.org/components/kernel/leg-virt-tianocore-edk2-upstream/latest/QEMU-KERNEL-AARCH64/RELEASE_GCC49/QEMU_EFI.fd +http://snapshots.linaro.org/components/kernel/leg-virt-tianocore-edk2-upstream/latest/QEMU-KERNEL-AARCH64/RELEASE_GCC5/QEMU_EFI.fd Boot binaries, except BL1, are primarily loaded via semi-hosting so all binaries has to reside in the same directory as QEMU is started from. This @@ -33,7 +33,7 @@ is conveniently achieved with symlinks the local names as: - ``bl2.bin`` -> BL2 - ``bl31.bin`` -> BL31 - ``bl33.bin`` -> BL33 (``QEMU_EFI.fd``) -- ``Image`` -> linux/Image +- ``Image`` -> linux/arch/arm64/boot/Image To build: @@ -41,12 +41,12 @@ To build: make CROSS_COMPILE=aarch64-none-elf- PLAT=qemu -To start (QEMU v2.6.0): +To start (QEMU v4.1.0): .. code:: shell qemu-system-aarch64 -nographic -machine virt,secure=on -cpu cortex-a57 \ -kernel Image \ - -append console=ttyAMA0,38400 keep_bootcon root=/dev/vda2 \ + -append "console=ttyAMA0,38400 keep_bootcon root=/dev/vda2" \ -initrd rootfs-arm64.cpio.gz -smp 2 -m 1024 -bios bl1.bin \ -d unimp -semihosting-config enable,target=native |