From cefd2e22fa7a86d034fc3c5855098661a5e33cc9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20S=C3=B6ntgen?= Date: Wed, 6 Jun 2018 19:44:51 +0200 Subject: [PATCH] dde_ipxe: support more flavors of I218V/I219LM Fixes #2864. --- repos/dde_ipxe/patches/intel.patch | 6 ++++-- repos/dde_ipxe/ports/dde_ipxe.hash | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/repos/dde_ipxe/patches/intel.patch b/repos/dde_ipxe/patches/intel.patch index 075a63e38e..a3b671fa7f 100644 --- a/repos/dde_ipxe/patches/intel.patch +++ b/repos/dde_ipxe/patches/intel.patch @@ -1,5 +1,5 @@ diff --git a/src/drivers/net/intel.c b/src/drivers/net/intel.c -index c3a7d407..5e4eb435 100644 +index c3a7d407..c1eef144 100644 --- a/src/drivers/net/intel.c +++ b/src/drivers/net/intel.c @@ -305,6 +305,9 @@ static int intel_reset ( struct intel_nic *intel ) { @@ -12,16 +12,18 @@ index c3a7d407..5e4eb435 100644 /* Reset PHY and MAC simultaneously */ writel ( ( ctrl | INTEL_CTRL_RST | INTEL_CTRL_PHY_RST ), intel->regs + INTEL_CTRL ); -@@ -953,6 +956,14 @@ static struct pci_device_id intel_nics[] = { +@@ -953,6 +956,16 @@ static struct pci_device_id intel_nics[] = { PCI_ROM ( 0x8086, 0x1526, "82576-5", "82576", 0 ), PCI_ROM ( 0x8086, 0x1527, "82580-f2", "82580 Fiber", 0 ), PCI_ROM ( 0x8086, 0x1533, "i210", "I210", 0 ), + PCI_ROM ( 0x8086, 0x153a, "i217lm", "I217LM", 0 ), + PCI_ROM ( 0x8086, 0x1559, "i218v", "I218V", 0 ), + PCI_ROM ( 0x8086, 0x155a, "i218lm", "I218LM", 0 ), ++ PCI_ROM ( 0x8086, 0x15a1, "i218v", "I218V", 0 ), + PCI_ROM ( 0x8086, 0x15a2, "i218lm-3", "I218-LM", 0 ), + PCI_ROM ( 0x8086, 0x156f, "i219lm", "I219-LM", 0 ), + PCI_ROM ( 0x8086, 0x15b7, "i219lm", "I219-LM", 0 ), ++ PCI_ROM ( 0x8086, 0x15d7, "i219lm", "I219-LM", 0 ), + PCI_ROM ( 0x8086, 0x15e3, "i219lm", "I219-LM", 0 ), + PCI_ROM ( 0x8086, 0x1570, "i219v", "I219V", 0 ), PCI_ROM ( 0x8086, 0x294c, "82566dc-2", "82566DC-2", 0 ), diff --git a/repos/dde_ipxe/ports/dde_ipxe.hash b/repos/dde_ipxe/ports/dde_ipxe.hash index 0079bdf2eb..1a0bb870cb 100644 --- a/repos/dde_ipxe/ports/dde_ipxe.hash +++ b/repos/dde_ipxe/ports/dde_ipxe.hash @@ -1 +1 @@ -9e4ef3246fc967aaa1c00efe6979c628a580b2e8 +fade233a1bdea83652bb05a0e55d8566e3047884