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>

diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf
index 859457e9aae5d27d43437a663aa38eea6c7de17b..cd91bc03a6834e850d844a570fbe7cbfb1c0f899 100644 (file)
--- a/OvmfPkg/OvmfPkgIa32.fdf
+++ b/OvmfPkg/OvmfPkgIa32.fdf
@@ -294,11 +294,6 @@ INF MdeModulePkg/Logo/LogoDxe.inf
 #\r
 # Network modules\r
 #\r
-!if $(E1000_ENABLE)\r
-  FILE DRIVER = 5D695E11-9B3F-4b83-B25F-4A8D5D69BE07 {\r
-    SECTION PE32 = Intel3.5/EFI32/E3507E2.EFI\r
-  }\r
-!endif\r
   INF  MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf\r
   INF  MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf\r
   INF  MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf\r

diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf
index 2a0ed831378624ed501023708d7d4847b3a9e76e..fae82709aee1ff100af93324f7f11615c193f99a 100644 (file)
--- a/OvmfPkg/OvmfPkgIa32X64.fdf
+++ b/OvmfPkg/OvmfPkgIa32X64.fdf
@@ -296,7 +296,7 @@ INF MdeModulePkg/Logo/LogoDxe.inf
 #\r
 !if $(E1000_ENABLE)\r
   FILE DRIVER = 5D695E11-9B3F-4b83-B25F-4A8D5D69BE07 {\r
-    SECTION PE32 = Intel3.5/EFIX64/E3507X2.EFI\r
+    SECTION PE32 = Intel3.5/EFIX64/E3522X2.EFI\r
   }\r
 !endif\r
   INF  MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf\r

diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf
index ca61fa125795e9e645e9da52cfd670900ab53082..4da0b19b94cfb40cfa4830187c748f72feff5a14 100644 (file)
--- a/OvmfPkg/OvmfPkgX64.fdf
+++ b/OvmfPkg/OvmfPkgX64.fdf
@@ -296,7 +296,7 @@ INF MdeModulePkg/Logo/LogoDxe.inf
 #\r
 !if $(E1000_ENABLE)\r
   FILE DRIVER = 5D695E11-9B3F-4b83-B25F-4A8D5D69BE07 {\r
-    SECTION PE32 = Intel3.5/EFIX64/E3507X2.EFI\r
+    SECTION PE32 = Intel3.5/EFIX64/E3522X2.EFI\r
   }\r
 !endif\r
   INF  MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf\r

diff --git a/OvmfPkg/README b/OvmfPkg/README
index 33ff9432bb3ea42788344ad733260dadbaee3bba..00fb71848200f76fbfc1567d2b481812bf8e775f 100644 (file)
--- a/OvmfPkg/README
+++ b/OvmfPkg/README
@@ -224,24 +224,35 @@ longer.)
   basic virtio-net driver, located in OvmfPkg/VirtioNetDxe.\r
 \r
 * Also independently of the iPXE NIC drivers, Intel's proprietary E1000 NIC\r
-  driver (PROEFI) can be embedded in the OVMF image at build time:\r
-\r
-  - Download UEFI drivers for the e1000 NIC\r
-    - http://downloadcenter.intel.com/Detail_Desc.aspx?agr=Y&DwnldID=17515&lang=eng\r
-    - Install the drivers into a directory called Intel3.5 in your WORKSPACE.\r
+  driver (from the BootUtil distribution) can be embedded in the OVMF image at\r
+  build time:\r
+\r
+  - Download BootUtil:\r
+    - Navigate to\r
+      https://downloadcenter.intel.com/download/19186/Ethernet-Intel-Ethernet-Connections-Boot-Utility-Preboot-Images-and-EFI-Drivers\r
+    - Click the download link for "PREBOOT.EXE".\r
+    - Accept the Intel Software License Agreement that appears.\r
+    - Unzip "PREBOOT.EXE" into a separate directory (this works with the\r
+      "unzip" utility on platforms different from Windows as well).\r
+    - Copy the "APPS/EFI/EFIx64/E3522X2.EFI" driver binary to\r
+      "Intel3.5/EFIX64/E3522X2.EFI" in your WORKSPACE.\r
+    - Intel have stopped distributing an IA32 driver binary (which used to\r
+      match the filename pattern "E35??E2.EFI"), thus this method will only\r
+      work for the IA32X64 and X64 builds of OVMF.\r
 \r
   - Include the driver in OVMF during the build:\r
-    - Add "-D E1000_ENABLE" to your build command,\r
+    - Add "-D E1000_ENABLE" to your build command (only when building\r
+      "OvmfPkg/OvmfPkgIa32X64.dsc" or "OvmfPkg/OvmfPkgX64.dsc").\r
     - For example: "build -D E1000_ENABLE".\r
 \r
 * When a matching iPXE driver is configured for a NIC as described above, it\r
   takes priority over other drivers that could possibly drive the card too:\r
 \r
-                 | e1000  ne2k_pci  pcnet  rtl8139  virtio-net-pci\r
-    -------------+------------------------------------------------\r
-    iPXE         |   x       x        x       x           x\r
-    VirtioNetDxe |                                        x\r
-    Intel PROEFI |   x\r
+                         | e1000  ne2k_pci  pcnet  rtl8139  virtio-net-pci\r
+    ---------------------+------------------------------------------------\r
+    iPXE                 |   x       x        x       x           x\r
+    VirtioNetDxe         |                                        x\r
+    Intel BootUtil (X64) |   x\r
 \r
 === OVMF Flash Layout ===\r
 \r