diff --git a/arch/riscv/Kbuild b/arch/riscv/Kbuild
new file mode 100644
index 0000000000000000000000000000000000000000..d1d0aa70fdf15c6e9ebb9a5d85757035b7189149
--- /dev/null
+++ b/arch/riscv/Kbuild
@@ -0,0 +1,3 @@
+# SPDX-License-Identifier: GPL-2.0-only
+
+obj-y += kernel/ mm/ net/
diff --git a/arch/riscv/Makefile b/arch/riscv/Makefile
index 7a117be8297c89253fbe0ce07397a10a25181238..a73659e30f8d7f0e56144f08f9e451130b928313 100644
--- a/arch/riscv/Makefile
+++ b/arch/riscv/Makefile
@@ -72,7 +72,7 @@ KBUILD_IMAGE	:= $(boot)/Image.gz
 
 head-y := arch/riscv/kernel/head.o
 
-core-y += arch/riscv/kernel/ arch/riscv/mm/ arch/riscv/net/
+core-y += arch/riscv/
 
 libs-y += arch/riscv/lib/