diff options
author | Laszlo Ersek <lersek@redhat.com> | 2017-06-27 18:16:14 +0200 |
---|---|---|
committer | Laszlo Ersek <lersek@redhat.com> | 2017-07-05 22:11:31 +0200 |
commit | 253d81c71f67e1ab218450b87370abd3bf01d571 (patch) | |
tree | e848e827e915e085b4fa195305038e522b705b2e | |
parent | 504f149100e97f72e17befed2f07582f2cb8c0ac (diff) | |
download | edk2-253d81c71f67e1ab218450b87370abd3bf01d571.tar.gz |
OvmfPkg: update -D E1000_ENABLE from Intel PROEFI v.07 to BootUtil v.22
Jiaxin reports that the OvmfPkg/README instructions for downloading the
Intel PROEFI drivers, and the filenames in OvmfPkg/OvmfPkg*.fdf for
incorporating the same in the OVMF binaries, are no longer up to date; the
download link has stopped working.
Additionally, the IA32 driver binary is no more distributed by Intel.
Update OvmfPkg/README with new download instructions, and adapt the OVMF
FDF files.
With this driver in use for QEMU's e1000 NIC, the DH shell command prints,
as Controller Name, "Intel(R) PRO/1000 MT Network Connection". I
successfully tested DHCP and ping from the UEFI shell.
Cc: Jiaxin Wu <jiaxin.wu@intel.com>
Cc: Jordan Justen <jordan.l.justen@intel.com>
Reported-by: Jiaxin Wu <jiaxin.wu@intel.com>
Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=613
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Tested-by: Wu Jiaxin <jiaxin.wu@intel.com>
Reviewed-by: Wu Jiaxin <jiaxin.wu@intel.com>
Acked-by: Jordan Justen <jordan.l.justen@intel.com>
-rw-r--r-- | OvmfPkg/OvmfPkgIa32.fdf | 5 | ||||
-rw-r--r-- | OvmfPkg/OvmfPkgIa32X64.fdf | 2 | ||||
-rw-r--r-- | OvmfPkg/OvmfPkgX64.fdf | 2 | ||||
-rw-r--r-- | OvmfPkg/README | 33 |
4 files changed, 24 insertions, 18 deletions
diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf index 859457e9aa..cd91bc03a6 100644 --- a/OvmfPkg/OvmfPkgIa32.fdf +++ b/OvmfPkg/OvmfPkgIa32.fdf @@ -294,11 +294,6 @@ INF MdeModulePkg/Logo/LogoDxe.inf #
# Network modules
#
-!if $(E1000_ENABLE)
- FILE DRIVER = 5D695E11-9B3F-4b83-B25F-4A8D5D69BE07 {
- SECTION PE32 = Intel3.5/EFI32/E3507E2.EFI
- }
-!endif
INF MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf
INF MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf
INF MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf
diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf index 2a0ed83137..fae82709ae 100644 --- a/OvmfPkg/OvmfPkgIa32X64.fdf +++ b/OvmfPkg/OvmfPkgIa32X64.fdf @@ -296,7 +296,7 @@ INF MdeModulePkg/Logo/LogoDxe.inf #
!if $(E1000_ENABLE)
FILE DRIVER = 5D695E11-9B3F-4b83-B25F-4A8D5D69BE07 {
- SECTION PE32 = Intel3.5/EFIX64/E3507X2.EFI
+ SECTION PE32 = Intel3.5/EFIX64/E3522X2.EFI
}
!endif
INF MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf
diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf index ca61fa1257..4da0b19b94 100644 --- a/OvmfPkg/OvmfPkgX64.fdf +++ b/OvmfPkg/OvmfPkgX64.fdf @@ -296,7 +296,7 @@ INF MdeModulePkg/Logo/LogoDxe.inf #
!if $(E1000_ENABLE)
FILE DRIVER = 5D695E11-9B3F-4b83-B25F-4A8D5D69BE07 {
- SECTION PE32 = Intel3.5/EFIX64/E3507X2.EFI
+ SECTION PE32 = Intel3.5/EFIX64/E3522X2.EFI
}
!endif
INF MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf
diff --git a/OvmfPkg/README b/OvmfPkg/README index 33ff9432bb..00fb718482 100644 --- a/OvmfPkg/README +++ b/OvmfPkg/README @@ -224,24 +224,35 @@ longer.) basic virtio-net driver, located in OvmfPkg/VirtioNetDxe.
* Also independently of the iPXE NIC drivers, Intel's proprietary E1000 NIC
- driver (PROEFI) can be embedded in the OVMF image at build time:
-
- - Download UEFI drivers for the e1000 NIC
- - http://downloadcenter.intel.com/Detail_Desc.aspx?agr=Y&DwnldID=17515&lang=eng
- - Install the drivers into a directory called Intel3.5 in your WORKSPACE.
+ driver (from the BootUtil distribution) can be embedded in the OVMF image at
+ build time:
+
+ - Download BootUtil:
+ - Navigate to
+ https://downloadcenter.intel.com/download/19186/Ethernet-Intel-Ethernet-Connections-Boot-Utility-Preboot-Images-and-EFI-Drivers
+ - Click the download link for "PREBOOT.EXE".
+ - Accept the Intel Software License Agreement that appears.
+ - Unzip "PREBOOT.EXE" into a separate directory (this works with the
+ "unzip" utility on platforms different from Windows as well).
+ - Copy the "APPS/EFI/EFIx64/E3522X2.EFI" driver binary to
+ "Intel3.5/EFIX64/E3522X2.EFI" in your WORKSPACE.
+ - Intel have stopped distributing an IA32 driver binary (which used to
+ match the filename pattern "E35??E2.EFI"), thus this method will only
+ work for the IA32X64 and X64 builds of OVMF.
- Include the driver in OVMF during the build:
- - Add "-D E1000_ENABLE" to your build command,
+ - Add "-D E1000_ENABLE" to your build command (only when building
+ "OvmfPkg/OvmfPkgIa32X64.dsc" or "OvmfPkg/OvmfPkgX64.dsc").
- For example: "build -D E1000_ENABLE".
* When a matching iPXE driver is configured for a NIC as described above, it
takes priority over other drivers that could possibly drive the card too:
- | e1000 ne2k_pci pcnet rtl8139 virtio-net-pci
- -------------+------------------------------------------------
- iPXE | x x x x x
- VirtioNetDxe | x
- Intel PROEFI | x
+ | e1000 ne2k_pci pcnet rtl8139 virtio-net-pci
+ ---------------------+------------------------------------------------
+ iPXE | x x x x x
+ VirtioNetDxe | x
+ Intel BootUtil (X64) | x
=== OVMF Flash Layout ===
|