Skip to contentSkip to conversation

riscv: move errata/ and kvm/ builds to arch/riscv/Kbuild

PATCH In review Masahiro Yamada 3 participants 3 messages May 11, 2022 – Jun 2, 2022 RISC-V

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 riscv: move errata/ and kvm/ builds to arch/riscv/Kbuild

Commit 909548d6c578 ("riscv: add arch/riscv/Kbuild") intended that subdirectories in arch/riscv/ would be added in arch/riscv/Kbuild.

---

 arch/riscv/Kbuild   | 2 ++
 arch/riscv/Makefile | 3 ---
 2 files changed, 2 insertions(+), 3 deletions(-)
arch/riscv/Kbuild +2 -0
index fb3397223d52..525ef2482253 100644
@@ -2,6 +2,8 @@
 
 obj-y += kernel/ mm/ net/
 obj-$(CONFIG_BUILTIN_DTB) += boot/dts/
+obj-$(CONFIG_RISCV_ERRATA_ALTERNATIVE) += errata/
+obj-$(CONFIG_KVM) += kvm/
 
 # for cleaning
 subdir- += boot
arch/riscv/Makefile +0 -3
index 7d81102cffd4..fd9fda67c038 100644
@@ -103,9 +103,6 @@ endif
 
 head-y := arch/riscv/kernel/head.o
 
-core-$(CONFIG_RISCV_ERRATA_ALTERNATIVE) += arch/riscv/errata/
-core-$(CONFIG_KVM) += arch/riscv/kvm/
-
 libs-y += arch/riscv/lib/
 libs-$(CONFIG_EFI_STUB) += $(objtree)/drivers/firmware/efi/libstub/lib.a
 
Signature · 7 lines
2.32.0


_______________________________________________
linux-riscv mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-riscv
Reviewed-by on v1 1/1
#1 lore raw
Quoted 5 lines · Masahiro Yamada

Commit 909548d6c578 ("riscv: add arch/riscv/Kbuild") intended that subdirectories in arch/riscv/ would be added in arch/riscv/Kbuild.

Looks good to me.

Regards,
Anup

Quoted 37 lines

---

 arch/riscv/Kbuild   | 2 ++
 arch/riscv/Makefile | 3 ---
 2 files changed, 2 insertions(+), 3 deletions(-)
arch/riscv/Kbuild +2 -0
index fb3397223d52..525ef2482253 100644
@@ -2,6 +2,8 @@
 
 obj-y += kernel/ mm/ net/
 obj-$(CONFIG_BUILTIN_DTB) += boot/dts/
+obj-$(CONFIG_RISCV_ERRATA_ALTERNATIVE) += errata/
+obj-$(CONFIG_KVM) += kvm/
 
 # for cleaning
 subdir- += boot
arch/riscv/Makefile +0 -4
index 7d81102cffd4..fd9fda67c038 100644
@@ -103,9 +103,6 @@ endif
 
 head-y := arch/riscv/kernel/head.o
 
-core-$(CONFIG_RISCV_ERRATA_ALTERNATIVE) += arch/riscv/errata/
-core-$(CONFIG_KVM) += arch/riscv/kvm/
-
 libs-y += arch/riscv/lib/
 libs-$(CONFIG_EFI_STUB) += $(objtree)/drivers/firmware/efi/libstub/lib.a
 
--

2.32.0

Quoted 4 lines

_______________________________________________
linux-riscv mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-riscv

_______________________________________________
linux-riscv mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-riscv

maintainer
#2 lore raw
In reply to Masahiro Yamada
Quoted 28 lines · On Wed, 11 May 2022 11:44:08 PDT (-0700), [email protected] wrote:

Commit 909548d6c578 ("riscv: add arch/riscv/Kbuild") intended that subdirectories in arch/riscv/ would be added in arch/riscv/Kbuild.

---

 arch/riscv/Kbuild   | 2 ++
 arch/riscv/Makefile | 3 ---
 2 files changed, 2 insertions(+), 3 deletions(-)
arch/riscv/Kbuild +2 -0
index fb3397223d52..525ef2482253 100644
@@ -2,6 +2,8 @@
 
 obj-y += kernel/ mm/ net/
 obj-$(CONFIG_BUILTIN_DTB) += boot/dts/
+obj-$(CONFIG_RISCV_ERRATA_ALTERNATIVE) += errata/
+obj-$(CONFIG_KVM) += kvm/
 
 # for cleaning
 subdir- += boot
arch/riscv/Makefile +0 -0
index 7d81102cffd4..fd9fda67c038 100644

arch/riscv/Makefile endif · line 107

Quoted 8 lines
arch/riscv/Makefile +0 -3
@@ -103,9 +103,6 @@ endif
 
 head-y := arch/riscv/kernel/head.o
 
-core-$(CONFIG_RISCV_ERRATA_ALTERNATIVE) += arch/riscv/errata/
-core-$(CONFIG_KVM) += arch/riscv/kvm/
-
 libs-y += arch/riscv/lib/
 libs-$(CONFIG_EFI_STUB) += $(objtree)/drivers/firmware/efi/libstub/lib.a

Thanks, this is on for-next. There was a conflict with the CONFIG_RISCV_ERRATA_ALTERNATIVE removal that I had to fix up, looks pretty easy but LMK if anything went wrong.

Thanks!

_______________________________________________
linux-riscv mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-riscv