| Message ID | 20220511184408.2751850-1-masahiroy@kernel.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | riscv: move errata/ and kvm/ builds to arch/riscv/Kbuild | expand |
On Thu, May 12, 2022 at 12:17 AM Masahiro Yamada <masahiroy@kernel.org> wrote: > > Commit 909548d6c578 ("riscv: add arch/riscv/Kbuild") intended that > subdirectories in arch/riscv/ would be added in arch/riscv/Kbuild. > > Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> Looks good to me. Reviewed-by: Anup Patel <anup@brainfault.org> Regards, Anup > --- > > arch/riscv/Kbuild | 2 ++ > arch/riscv/Makefile | 3 --- > 2 files changed, 2 insertions(+), 3 deletions(-) > > diff --git a/arch/riscv/Kbuild b/arch/riscv/Kbuild > index fb3397223d52..525ef2482253 100644 > --- a/arch/riscv/Kbuild > +++ b/arch/riscv/Kbuild > @@ -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 > diff --git a/arch/riscv/Makefile b/arch/riscv/Makefile > index 7d81102cffd4..fd9fda67c038 100644 > --- a/arch/riscv/Makefile > +++ b/arch/riscv/Makefile > @@ -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 > > > _______________________________________________ > linux-riscv mailing list > linux-riscv@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-riscv
On Wed, 11 May 2022 11:44:08 PDT (-0700), masahiroy@kernel.org wrote: > Commit 909548d6c578 ("riscv: add arch/riscv/Kbuild") intended that > subdirectories in arch/riscv/ would be added in arch/riscv/Kbuild. > > Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> > --- > > arch/riscv/Kbuild | 2 ++ > arch/riscv/Makefile | 3 --- > 2 files changed, 2 insertions(+), 3 deletions(-) > > diff --git a/arch/riscv/Kbuild b/arch/riscv/Kbuild > index fb3397223d52..525ef2482253 100644 > --- a/arch/riscv/Kbuild > +++ b/arch/riscv/Kbuild > @@ -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 > diff --git a/arch/riscv/Makefile b/arch/riscv/Makefile > index 7d81102cffd4..fd9fda67c038 100644 > --- a/arch/riscv/Makefile > +++ b/arch/riscv/Makefile > @@ -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!
diff --git a/arch/riscv/Kbuild b/arch/riscv/Kbuild index fb3397223d52..525ef2482253 100644 --- a/arch/riscv/Kbuild +++ b/arch/riscv/Kbuild @@ -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 diff --git a/arch/riscv/Makefile b/arch/riscv/Makefile index 7d81102cffd4..fd9fda67c038 100644 --- a/arch/riscv/Makefile +++ b/arch/riscv/Makefile @@ -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
Commit 909548d6c578 ("riscv: add arch/riscv/Kbuild") intended that subdirectories in arch/riscv/ would be added in arch/riscv/Kbuild. Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> --- arch/riscv/Kbuild | 2 ++ arch/riscv/Makefile | 3 --- 2 files changed, 2 insertions(+), 3 deletions(-)