4 files changed, 17 insertions, 25 deletions
diff --git a/drivers/Build.mk b/drivers/Build.mk
new file mode 100644
index 0000000..342f02b
--- /dev/null
+++ b/drivers/Build.mk
@@ -0,0 +1,17 @@
+targets += drivers/base drivers/tty drivers/core
+target.drivers/base.kind := source-set
+target.drivers/base.sources := \
+    drivers/base/bus.cc drivers/base/core.cc drivers/base/driver.cc \
+    drivers/base/platform.cc
+
+target.drivers/tty.kind := source-set
+target.drivers/tty.sources := \
+    drivers/tty/tty_core.cc drivers/tty/n_tty.cc drivers/tty/tty_uart.cc
+
+target.drivers/core.kind := source-set
+target.drivers/core.deps := drivers/base drivers/tty
+target.drivers/core.sources := drivers/uart.cc drivers/console.cc
+ifeq ($(ARCH),riscv)
+target.drivers/core.sources += drivers/plic.cc
+endif
+
diff --git a/drivers/base/module.mk b/drivers/base/module.mk
deleted file mode 100644
index 1d8fb05..0000000
--- a/drivers/base/module.mk
+++ /dev/null
@@ -1,9 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
-# Copyright (C) 2026 Richard Qin
-#
-# Driver model core (mirrors Linux drivers/base/)
-
-SRCS_CC += drivers/base/bus.cc
-SRCS_CC += drivers/base/core.cc
-SRCS_CC += drivers/base/driver.cc
-SRCS_CC += drivers/base/platform.cc
diff --git a/drivers/module.mk b/drivers/module.mk
deleted file mode 100644
index 9326f30..0000000
--- a/drivers/module.mk
+++ /dev/null
@@ -1,11 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
-# Copyright (C) 2026 Richard Qin
-#
-# Drivers module
-
-SRCS_CC += drivers/uart.cc
-SRCS_CC += drivers/console.cc
-
-ifeq ($(ARCH),riscv)
-SRCS_CC += drivers/plic.cc
-endif
diff --git a/drivers/tty/module.mk b/drivers/tty/module.mk
deleted file mode 100644
index 49190d4..0000000
--- a/drivers/tty/module.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-# drivers/tty/module.mk — TTY subsystem build rules
-
-SRCS_CC += drivers/tty/tty_core.cc
-SRCS_CC += drivers/tty/n_tty.cc
-SRCS_CC += drivers/tty/tty_uart.cc