| Message ID | 1544760112-5378-1-git-send-email-yamada.masahiro@socionext.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | arm64: replace arm64-obj-* in Makefile with obj-* | expand |
Hi Masahiro, On Fri, Dec 14, 2018 at 01:01:52PM +0900, Masahiro Yamada wrote: > Use the standard obj-$(CONFIG_...) syntex. The behavior is still the > same. > > Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> > --- > > arch/arm64/kernel/Makefile | 59 +++++++++++++++++++++++----------------------- > 1 file changed, 29 insertions(+), 30 deletions(-) I'm fine with this patch, but I think I'd prefer to apply it at -rc1 so we don't end up with lots of silly conflicts in the Makefile for any new files added during the merge window. Is that ok with you? Will
Hi Will, On Fri, Dec 14, 2018 at 6:54 PM Will Deacon <will.deacon@arm.com> wrote: > > Hi Masahiro, > > On Fri, Dec 14, 2018 at 01:01:52PM +0900, Masahiro Yamada wrote: > > Use the standard obj-$(CONFIG_...) syntex. The behavior is still the > > same. > > > > Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> > > --- > > > > arch/arm64/kernel/Makefile | 59 +++++++++++++++++++++++----------------------- > > 1 file changed, 29 insertions(+), 30 deletions(-) > > I'm fine with this patch, but I think I'd prefer to apply it at -rc1 so > we don't end up with lots of silly conflicts in the Makefile for any new > files added during the merge window. > > Is that ok with you? Sure!
On Fri, Dec 14, 2018 at 07:35:57PM +0900, Masahiro Yamada wrote: > Hi Will, > > On Fri, Dec 14, 2018 at 6:54 PM Will Deacon <will.deacon@arm.com> wrote: > > > > Hi Masahiro, > > > > On Fri, Dec 14, 2018 at 01:01:52PM +0900, Masahiro Yamada wrote: > > > Use the standard obj-$(CONFIG_...) syntex. The behavior is still the > > > same. > > > > > > Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> > > > --- > > > > > > arch/arm64/kernel/Makefile | 59 +++++++++++++++++++++++----------------------- > > > 1 file changed, 29 insertions(+), 30 deletions(-) > > > > I'm fine with this patch, but I think I'd prefer to apply it at -rc1 so > > we don't end up with lots of silly conflicts in the Makefile for any new > > files added during the merge window. > > > > Is that ok with you? > > Sure! Brill. Please poke me again in January if it hasn't landed by then ;) Will
Hi Will, On Fri, Dec 14, 2018 at 7:40 PM Will Deacon <will.deacon@arm.com> wrote: > > On Fri, Dec 14, 2018 at 07:35:57PM +0900, Masahiro Yamada wrote: > > Hi Will, > > > > On Fri, Dec 14, 2018 at 6:54 PM Will Deacon <will.deacon@arm.com> wrote: > > > > > > Hi Masahiro, > > > > > > On Fri, Dec 14, 2018 at 01:01:52PM +0900, Masahiro Yamada wrote: > > > > Use the standard obj-$(CONFIG_...) syntex. The behavior is still the > > > > same. > > > > > > > > Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> > > > > --- > > > > > > > > arch/arm64/kernel/Makefile | 59 +++++++++++++++++++++++----------------------- > > > > 1 file changed, 29 insertions(+), 30 deletions(-) > > > > > > I'm fine with this patch, but I think I'd prefer to apply it at -rc1 so > > > we don't end up with lots of silly conflicts in the Makefile for any new > > > files added during the merge window. > > > > > > Is that ok with you? > > > > Sure! > > Brill. Please poke me again in January if it hasn't landed by then ;) > > Will I just sent v2. https://lore.kernel.org/patchwork/patch/1028882/ Thanks.
diff --git a/arch/arm64/kernel/Makefile b/arch/arm64/kernel/Makefile index 583334c..b4e4f7e 100644 --- a/arch/arm64/kernel/Makefile +++ b/arch/arm64/kernel/Makefile @@ -12,7 +12,7 @@ CFLAGS_REMOVE_insn.o = -pg CFLAGS_REMOVE_return_address.o = -pg # Object file lists. -arm64-obj-y := debug-monitors.o entry.o irq.o fpsimd.o \ +obj-y := debug-monitors.o entry.o irq.o fpsimd.o \ entry-fpsimd.o process.o ptrace.o setup.o signal.o \ sys.o stacktrace.o time.o traps.o io.o vdso.o \ hyp-stub.o psci.o cpu_ops.o insn.o \ @@ -27,40 +27,39 @@ OBJCOPYFLAGS := --prefix-symbols=__efistub_ $(obj)/%.stub.o: $(obj)/%.o FORCE $(call if_changed,objcopy) -arm64-obj-$(CONFIG_COMPAT) += sys32.o kuser32.o signal32.o \ +obj-$(CONFIG_COMPAT) += sys32.o kuser32.o signal32.o \ sys_compat.o -arm64-obj-$(CONFIG_FUNCTION_TRACER) += ftrace.o entry-ftrace.o -arm64-obj-$(CONFIG_MODULES) += module.o -arm64-obj-$(CONFIG_ARM64_MODULE_PLTS) += module-plts.o -arm64-obj-$(CONFIG_PERF_EVENTS) += perf_regs.o perf_callchain.o -arm64-obj-$(CONFIG_HW_PERF_EVENTS) += perf_event.o -arm64-obj-$(CONFIG_HAVE_HW_BREAKPOINT) += hw_breakpoint.o -arm64-obj-$(CONFIG_CPU_PM) += sleep.o suspend.o -arm64-obj-$(CONFIG_CPU_IDLE) += cpuidle.o -arm64-obj-$(CONFIG_JUMP_LABEL) += jump_label.o -arm64-obj-$(CONFIG_KGDB) += kgdb.o -arm64-obj-$(CONFIG_EFI) += efi.o efi-entry.stub.o \ +obj-$(CONFIG_FUNCTION_TRACER) += ftrace.o entry-ftrace.o +obj-$(CONFIG_MODULES) += module.o +obj-$(CONFIG_ARM64_MODULE_PLTS) += module-plts.o +obj-$(CONFIG_PERF_EVENTS) += perf_regs.o perf_callchain.o +obj-$(CONFIG_HW_PERF_EVENTS) += perf_event.o +obj-$(CONFIG_HAVE_HW_BREAKPOINT) += hw_breakpoint.o +obj-$(CONFIG_CPU_PM) += sleep.o suspend.o +obj-$(CONFIG_CPU_IDLE) += cpuidle.o +obj-$(CONFIG_JUMP_LABEL) += jump_label.o +obj-$(CONFIG_KGDB) += kgdb.o +obj-$(CONFIG_EFI) += efi.o efi-entry.stub.o \ efi-rt-wrapper.o -arm64-obj-$(CONFIG_PCI) += pci.o -arm64-obj-$(CONFIG_ARMV8_DEPRECATED) += armv8_deprecated.o -arm64-obj-$(CONFIG_ACPI) += acpi.o -arm64-obj-$(CONFIG_ACPI_NUMA) += acpi_numa.o -arm64-obj-$(CONFIG_ARM64_ACPI_PARKING_PROTOCOL) += acpi_parking_protocol.o -arm64-obj-$(CONFIG_PARAVIRT) += paravirt.o -arm64-obj-$(CONFIG_RANDOMIZE_BASE) += kaslr.o -arm64-obj-$(CONFIG_HIBERNATION) += hibernate.o hibernate-asm.o -arm64-obj-$(CONFIG_KEXEC_CORE) += machine_kexec.o relocate_kernel.o \ +obj-$(CONFIG_PCI) += pci.o +obj-$(CONFIG_ARMV8_DEPRECATED) += armv8_deprecated.o +obj-$(CONFIG_ACPI) += acpi.o +obj-$(CONFIG_ACPI_NUMA) += acpi_numa.o +obj-$(CONFIG_ARM64_ACPI_PARKING_PROTOCOL) += acpi_parking_protocol.o +obj-$(CONFIG_PARAVIRT) += paravirt.o +obj-$(CONFIG_RANDOMIZE_BASE) += kaslr.o +obj-$(CONFIG_HIBERNATION) += hibernate.o hibernate-asm.o +obj-$(CONFIG_KEXEC_CORE) += machine_kexec.o relocate_kernel.o \ cpu-reset.o -arm64-obj-$(CONFIG_KEXEC_FILE) += machine_kexec_file.o kexec_image.o -arm64-obj-$(CONFIG_ARM64_RELOC_TEST) += arm64-reloc-test.o +obj-$(CONFIG_KEXEC_FILE) += machine_kexec_file.o kexec_image.o +obj-$(CONFIG_ARM64_RELOC_TEST) += arm64-reloc-test.o arm64-reloc-test-y := reloc_test_core.o reloc_test_syms.o -arm64-obj-$(CONFIG_CRASH_DUMP) += crash_dump.o -arm64-obj-$(CONFIG_CRASH_CORE) += crash_core.o -arm64-obj-$(CONFIG_ARM_SDE_INTERFACE) += sdei.o -arm64-obj-$(CONFIG_ARM64_SSBD) += ssbd.o +obj-$(CONFIG_CRASH_DUMP) += crash_dump.o +obj-$(CONFIG_CRASH_CORE) += crash_core.o +obj-$(CONFIG_ARM_SDE_INTERFACE) += sdei.o +obj-$(CONFIG_ARM64_SSBD) += ssbd.o -obj-y += $(arm64-obj-y) vdso/ probes/ -obj-m += $(arm64-obj-m) +obj-y += vdso/ probes/ head-y := head.o extra-y += $(head-y) vmlinux.lds
Use the standard obj-$(CONFIG_...) syntex. The behavior is still the same. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> --- arch/arm64/kernel/Makefile | 59 +++++++++++++++++++++++----------------------- 1 file changed, 29 insertions(+), 30 deletions(-)