arm64: replace arm64-obj-* in Makefile with obj-*

Use the standard obj-$(CONFIG_...) syntex. The behavior is still the
same.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>

diff --git a/arch/arm64/kernel/Makefile b/arch/arm64/kernel/Makefile
index df08d735b21d37ef85b28064ed12a90ce99ad66b..cd434d0719c1cf8ade1aaacdec52a7c69d11d605 100644 (file)
--- 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,41 +27,40 @@ 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
-arm64-obj-$(CONFIG_ARM64_PTR_AUTH)     += pointer_auth.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-$(CONFIG_ARM64_PTR_AUTH)           += pointer_auth.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