diff mbox series

[3/4] boot/grub2: update readme.txt details

Message ID 20220719074042.2214649-4-thomas.petazzoni@bootlin.com
State Changes Requested
Headers show
Series Update grub to 2.06 | expand

Commit Message

Thomas Petazzoni July 19, 2022, 7:40 a.m. UTC
For the Qemu-compatible UEFI firmware, the kraxel.org pointed to by
the readme.txt file is outdated. Instead, point to the recently added
ovmf-bin package in Buildroot.

While at it, drop the pci=nocrs information, as it is no longer
needed.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
---
 boot/grub2/readme.txt | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

Comments

Yann E. MORIN July 23, 2022, 5:08 p.m. UTC | #1
Thomas, All,

On 2022-07-19 09:40 +0200, Thomas Petazzoni via buildroot spake thusly:
> For the Qemu-compatible UEFI firmware, the kraxel.org pointed to by
> the readme.txt file is outdated. Instead, point to the recently added
> ovmf-bin package in Buildroot.

Since we do not have ovmf-bin in the end, I've tweaked the text to
explain how to get the OVMF blurbs; please review my chhanges if they
still make sense.

Applied to master, thanks.

Regards,
Yann E. MORIN.

> While at it, drop the pci=nocrs information, as it is no longer
> needed.
> 
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
> ---
>  boot/grub2/readme.txt | 21 ++++++++-------------
>  1 file changed, 8 insertions(+), 13 deletions(-)
> 
> diff --git a/boot/grub2/readme.txt b/boot/grub2/readme.txt
> index 0282fbdd13..c8d475ec73 100644
> --- a/boot/grub2/readme.txt
> +++ b/boot/grub2/readme.txt
> @@ -86,17 +86,10 @@ Notes on using Grub2 for x86/x86_64 EFI-based platforms
>  To test your i386/x86-64 EFI image in Qemu
>  ------------------------------------------
>  
> -1. Download the EFI BIOS for Qemu
> -   Version IA32 or X64 depending on the chosen Grub2
> -   platform (i386-efi vs. x86-64-efi)
> -   https://www.kraxel.org/repos/jenkins/edk2/
> -   (or use one provided by your distribution as OVMF)
> -2. Extract, and rename OVMF.fd to bios.bin and
> -   CirrusLogic5446.rom to vgabios-cirrus.bin.
> -3. qemu-system-{i386,x86-64} -L ovmf-dir/ -hda disk.img
> -4. Make sure to pass pci=nocrs to the kernel command line,
> -   to workaround a bug in the EFI BIOS regarding the
> -   EFI framebuffer.
> +1. Download/install the EFI BIOS for Qemu
> +   You can get it using the ovmf-bin package in Buildroot (installed
> +   in BINARIES_DIR), or use one provided by your distribution as OVMF.
> +2. qemu-system-{i386,x86-64} -bios <path-to-OVMF.fd> -hda disk.img
>  
>  Notes on using Grub2 for ARM u-boot-based platforms
>  ===================================================
> @@ -177,8 +170,10 @@ using qemu and EFI firmware built for qemu.
>   2. make
>  
>   3. Download the EFI firmware for qemu aarch64
> -    https://www.kraxel.org/repos/jenkins/edk2/
> -    (or use one provided by your distribution as OVMF-aarch64 or AAVMF)
> +
> +    You can get it using the ovmf-bin package in Buildroot (installed
> +    in BINARIES_DIR), or use one provided by your distribution as
> +    OVMF-aarch64 or AAVMF.
>  
>   4. Run qemu with:
>  
> -- 
> 2.36.1
> 
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot
diff mbox series

Patch

diff --git a/boot/grub2/readme.txt b/boot/grub2/readme.txt
index 0282fbdd13..c8d475ec73 100644
--- a/boot/grub2/readme.txt
+++ b/boot/grub2/readme.txt
@@ -86,17 +86,10 @@  Notes on using Grub2 for x86/x86_64 EFI-based platforms
 To test your i386/x86-64 EFI image in Qemu
 ------------------------------------------
 
-1. Download the EFI BIOS for Qemu
-   Version IA32 or X64 depending on the chosen Grub2
-   platform (i386-efi vs. x86-64-efi)
-   https://www.kraxel.org/repos/jenkins/edk2/
-   (or use one provided by your distribution as OVMF)
-2. Extract, and rename OVMF.fd to bios.bin and
-   CirrusLogic5446.rom to vgabios-cirrus.bin.
-3. qemu-system-{i386,x86-64} -L ovmf-dir/ -hda disk.img
-4. Make sure to pass pci=nocrs to the kernel command line,
-   to workaround a bug in the EFI BIOS regarding the
-   EFI framebuffer.
+1. Download/install the EFI BIOS for Qemu
+   You can get it using the ovmf-bin package in Buildroot (installed
+   in BINARIES_DIR), or use one provided by your distribution as OVMF.
+2. qemu-system-{i386,x86-64} -bios <path-to-OVMF.fd> -hda disk.img
 
 Notes on using Grub2 for ARM u-boot-based platforms
 ===================================================
@@ -177,8 +170,10 @@  using qemu and EFI firmware built for qemu.
  2. make
 
  3. Download the EFI firmware for qemu aarch64
-    https://www.kraxel.org/repos/jenkins/edk2/
-    (or use one provided by your distribution as OVMF-aarch64 or AAVMF)
+
+    You can get it using the ovmf-bin package in Buildroot (installed
+    in BINARIES_DIR), or use one provided by your distribution as
+    OVMF-aarch64 or AAVMF.
 
  4. Run qemu with: