diff --git a/kernel/Cargo.toml b/kernel/Cargo.toml
index f981f4b..8204965 100644
--- a/kernel/Cargo.toml
+++ b/kernel/Cargo.toml
@@ -20,6 +20,9 @@ bitflags = "^1.3.0"
 cortex-a = { version = "6.x.x" }
 
 [features]
-mach_qemu = []
+pl011 = []
+pl031 = []
+
+mach_qemu = ["pl011", "pl031"]
 mach_orangepi3 = []
 mach_rpi3 = []
diff --git a/kernel/src/dev/rtc/mod.rs b/kernel/src/dev/rtc/mod.rs
index f38fb8e..34d5937 100644
--- a/kernel/src/dev/rtc/mod.rs
+++ b/kernel/src/dev/rtc/mod.rs
@@ -2,6 +2,7 @@
 
 use crate::dev::Device;
 
+#[cfg(feature = "pl031")]
 pub mod pl031;
 
 // TODO define what RTC devices can do
diff --git a/kernel/src/dev/serial/mod.rs b/kernel/src/dev/serial/mod.rs
index 7db4ffb..2f84e84 100644
--- a/kernel/src/dev/serial/mod.rs
+++ b/kernel/src/dev/serial/mod.rs
@@ -3,6 +3,7 @@
 use crate::dev::Device;
 use error::Errno;
 
+#[cfg(feature = "pl011")]
 pub mod pl011;
 
 /// Generic interface for serial devices