| Message ID | 20200305052052.30757-1-masahiroy@kernel.org (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | b8f58ac7c38af1e22db125622a3a3e9bb9fb9fa2 |
| Headers | show |
| Series | arm64: efi: add efi-entry.o to targets instead of extra-$(CONFIG_EFI) | expand |
On Thu, 5 Mar 2020 at 06:21, Masahiro Yamada <masahiroy@kernel.org> wrote: > > efi-entry.o is built on demand for efi-entry.stub.o, so you do not have > to repeat $(CONFIG_EFI) here. Adding it to 'targets' is enough. > > Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> Acked-by: Ard Biesheuvel <ardb@kernel.org> > --- > > arch/arm64/kernel/Makefile | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/arch/arm64/kernel/Makefile b/arch/arm64/kernel/Makefile > index fc6488660f64..4e5b8ee31442 100644 > --- a/arch/arm64/kernel/Makefile > +++ b/arch/arm64/kernel/Makefile > @@ -21,7 +21,7 @@ obj-y := debug-monitors.o entry.o irq.o fpsimd.o \ > smp.o smp_spin_table.o topology.o smccc-call.o \ > syscall.o > > -extra-$(CONFIG_EFI) := efi-entry.o > +targets += efi-entry.o > > OBJCOPYFLAGS := --prefix-symbols=__efistub_ > $(obj)/%.stub.o: $(obj)/%.o FORCE > -- > 2.17.1 > > > _______________________________________________ > linux-arm-kernel mailing list > linux-arm-kernel@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
On 3/5/20 5:20 AM, Masahiro Yamada wrote: > efi-entry.o is built on demand for efi-entry.stub.o, so you do not have > to repeat $(CONFIG_EFI) here. Adding it to 'targets' is enough. > > Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> Reviewed-by: Vincenzo Frascino <vincenzo.frascino@arm.com> > --- > > arch/arm64/kernel/Makefile | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/arch/arm64/kernel/Makefile b/arch/arm64/kernel/Makefile > index fc6488660f64..4e5b8ee31442 100644 > --- a/arch/arm64/kernel/Makefile > +++ b/arch/arm64/kernel/Makefile > @@ -21,7 +21,7 @@ obj-y := debug-monitors.o entry.o irq.o fpsimd.o \ > smp.o smp_spin_table.o topology.o smccc-call.o \ > syscall.o > > -extra-$(CONFIG_EFI) := efi-entry.o > +targets += efi-entry.o > > OBJCOPYFLAGS := --prefix-symbols=__efistub_ > $(obj)/%.stub.o: $(obj)/%.o FORCE >
On Thu, Mar 05, 2020 at 02:20:52PM +0900, Masahiro Yamada wrote: > efi-entry.o is built on demand for efi-entry.stub.o, so you do not have > to repeat $(CONFIG_EFI) here. Adding it to 'targets' is enough. > > Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> Queued for 5.7. Thanks.
diff --git a/arch/arm64/kernel/Makefile b/arch/arm64/kernel/Makefile index fc6488660f64..4e5b8ee31442 100644 --- a/arch/arm64/kernel/Makefile +++ b/arch/arm64/kernel/Makefile @@ -21,7 +21,7 @@ obj-y := debug-monitors.o entry.o irq.o fpsimd.o \ smp.o smp_spin_table.o topology.o smccc-call.o \ syscall.o -extra-$(CONFIG_EFI) := efi-entry.o +targets += efi-entry.o OBJCOPYFLAGS := --prefix-symbols=__efistub_ $(obj)/%.stub.o: $(obj)/%.o FORCE
efi-entry.o is built on demand for efi-entry.stub.o, so you do not have to repeat $(CONFIG_EFI) here. Adding it to 'targets' is enough. Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> --- arch/arm64/kernel/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)