diff --git a/repos/dde_ipxe/lib/mk/dde_ipxe_nic.inc b/repos/dde_ipxe/lib/mk/dde_ipxe_nic.inc index dc28bbbeb..dbf7ba286 100644 --- a/repos/dde_ipxe/lib/mk/dde_ipxe_nic.inc +++ b/repos/dde_ipxe/lib/mk/dde_ipxe_nic.inc @@ -11,7 +11,7 @@ SRC_C += $(addprefix net/, ethernet.c netdevice.c nullnet.c eth_slow.c iobpad.c) SRC_C += $(addprefix drivers/bus/, pciextra.c) SRC_C += $(addprefix drivers/bitbash/, bitbash.c spi_bit.c) SRC_C += $(addprefix drivers/nvs/, nvs.c threewire.c) -SRC_C += $(addprefix drivers/net/, pcnet32.c intel.c eepro100.c realtek.c mii.c) +SRC_C += $(addprefix drivers/net/, intel.c eepro100.c realtek.c mii.c) SRC_C += $(addprefix drivers/net/tg3/, tg3.c tg3_hw.c tg3_phy.c) INC_DIR += $(LIB_DIR)/include diff --git a/repos/dde_ipxe/src/lib/dde_ipxe/nic.c b/repos/dde_ipxe/src/lib/dde_ipxe/nic.c index 61c7349fc..de53ff9ef 100644 --- a/repos/dde_ipxe/src/lib/dde_ipxe/nic.c +++ b/repos/dde_ipxe/src/lib/dde_ipxe/nic.c @@ -40,7 +40,6 @@ extern struct pci_driver realtek_driver, ifec_driver, intel_driver, - pcnet32_driver, tg3_pci_driver; @@ -51,7 +50,6 @@ static struct pci_driver *pci_drivers[] = { &realtek_driver, &ifec_driver, &intel_driver, - &pcnet32_driver, &tg3_pci_driver }; diff --git a/repos/gems/run/tcp_terminal.run b/repos/gems/run/tcp_terminal.run index bb85c2803..c869ff0cd 100644 --- a/repos/gems/run/tcp_terminal.run +++ b/repos/gems/run/tcp_terminal.run @@ -104,7 +104,7 @@ build_boot_image $boot_modules # qemu config append qemu_args " -m 128 -nographic " -append_if [have_spec x86] qemu_args " -net nic,model=pcnet " +append_if [have_spec x86] qemu_args " -net nic,model=e1000 " append_if [have_spec lan9118] qemu_args " -net nic,model=lan9118 " append qemu_args " -net user -redir tcp:5555::8888 " diff --git a/repos/libports/run/test-nicbridge_static.run b/repos/libports/run/test-nicbridge_static.run index eb8b0ea9e..530a68995 100644 --- a/repos/libports/run/test-nicbridge_static.run +++ b/repos/libports/run/test-nicbridge_static.run @@ -116,7 +116,7 @@ build_boot_image $boot_modules append qemu_args " -m 512 " -append_if [have_spec x86] qemu_args " -net nic,model=pcnet " +append_if [have_spec x86] qemu_args " -net nic,model=e1000 " append_if [have_spec lan9118] qemu_args " -net nic,model=lan9118 " append qemu_args " -net user " diff --git a/repos/libports/run/test-nicbridge_static2.run b/repos/libports/run/test-nicbridge_static2.run index ef64301eb..6dcb3086e 100644 --- a/repos/libports/run/test-nicbridge_static2.run +++ b/repos/libports/run/test-nicbridge_static2.run @@ -159,7 +159,7 @@ build_boot_image $boot_modules append qemu_args " -m 512 " -append_if [have_spec x86] qemu_args " -net nic,model=pcnet " +append_if [have_spec x86] qemu_args " -net nic,model=e1000 " append_if [have_spec lan9118] qemu_args " -net nic,model=lan9118 " append qemu_args " -net user " diff --git a/repos/ports/run/arora.run b/repos/ports/run/arora.run index 2d8f01646..869e88089 100644 --- a/repos/ports/run/arora.run +++ b/repos/ports/run/arora.run @@ -142,7 +142,7 @@ build_boot_image $boot_modules append qemu_args " -m 512 " -append_if [have_spec x86] qemu_args " -net nic,model=pcnet " +append_if [have_spec x86] qemu_args " -net nic,model=e1000 " append_if [have_spec lan9118] qemu_args " -net nic,model=lan9118 " append qemu_args " -net user "