Merge pull request hermit-os#446 from stlankes/rtl8139

add feature rtl8139
stlankes · Aug 2, 2023 · 991db36 · 991db36
2 parents 89053d1 + 8dbfc17
commit 991db36
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 0 deletions.
diff --git a/benches/netbench/Cargo.toml b/benches/netbench/Cargo.toml
@@ -29,6 +29,7 @@ fsgsbase = ["hermit-sys/fsgsbase"]
 smp = ["hermit-sys/smp"]
 tcp = ["hermit-sys/tcp"]
 instrument = ["hermit-sys/instrument"]
+rtl8139 = ["hermit-sys/rtl8139"]
 
 [[bin]]
 name = "server-bw"

diff --git a/examples/httpd/Cargo.toml b/examples/httpd/Cargo.toml
@@ -27,4 +27,5 @@ smp = ["hermit-sys/smp"]
 tcp = ["hermit-sys/tcp"]
 instrument = ["hermit-sys/instrument"]
 trace = ["hermit-sys/trace"]
+rtl8139 = ["hermit-sys/rtl8139"]
 ci = []
diff --git a/hermit-sys/Cargo.toml b/hermit-sys/Cargo.toml
@@ -39,6 +39,9 @@ tcp = []
 trace = []
 vga = []
 
+# if this feature isn't set, the Virtio interface will be used
+rtl8139 = ["tcp", "pci"]
+
 [build-dependencies]
 flate2 = "1"
 ureq = "2.4"

diff --git a/hermit-sys/build.rs b/hermit-sys/build.rs
@@ -114,6 +114,7 @@ impl KernelSrc {
 			&mut cmd,
 			[
 				"acpi", "dhcpv4", "fsgsbase", "pci", "pci-ids", "smp", "tcp", "trace", "vga",
+				"rtl8139",
 			]
 			.into_iter(),
 		);