ehmry/genode
ehmry
/
genode
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

dde_ipxe: remove (non-working) pcnet driver 

Also, adapted run scripts to use e1000 NIC model.

Fixes #1821
This commit is contained in:
Christian Helmuth 2016-06-22 15:05:57 +02:00
parent 101d052ddb
commit 8b78001858
6 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
repos/dde_ipxe/lib/mk/dde_ipxe_nic.inc
View File

@ -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

2
repos/dde_ipxe/src/lib/dde_ipxe/nic.c
View File

@ -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
};

2
repos/gems/run/tcp_terminal.run
View File

@ -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 "

2
repos/libports/run/test-nicbridge_static.run
View File

@ -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 "

2
repos/libports/run/test-nicbridge_static2.run
View File

@ -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 "

2
repos/ports/run/arora.run
View File

@ -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 "