修改内核路径

hc

2024-05-14 bedbef8ad3e75a304af6361af235302bcc61d06b

 kernel/arch/arm64/kernel/Makefile
..
..
@@ -3,68 +3,65 @@
3
3
 # Makefile for the linux kernel.
4
4
 #
5
5
 
6
-CPPFLAGS_vmlinux.lds	:= -DTEXT_OFFSET=$(TEXT_OFFSET)
7
-AFLAGS_head.o		:= -DTEXT_OFFSET=$(TEXT_OFFSET)
8
6
 CFLAGS_armv8_deprecated.o := -I$(src)
9
7
 
10
-CFLAGS_REMOVE_ftrace.o = -pg
11
-CFLAGS_REMOVE_insn.o = -pg
12
-CFLAGS_REMOVE_return_address.o = -pg
8
+CFLAGS_REMOVE_ftrace.o = $(CC_FLAGS_FTRACE)
9
+CFLAGS_REMOVE_insn.o = $(CC_FLAGS_FTRACE)
10
+CFLAGS_REMOVE_return_address.o = $(CC_FLAGS_FTRACE)
11
+CFLAGS_io.o := -D__DISABLE_TRACE_MMIO__
13
12
 
14
13
 # Object file lists.
15
-arm64-obj-y		:= debug-monitors.o entry.o irq.o fpsimd.o		\
16
-			   entry-fpsimd.o process.o ptrace.o setup.o signal.o	\
17
-			   sys.o stacktrace.o time.o traps.o io.o vdso.o	\
18
-			   hyp-stub.o psci.o cpu_ops.o insn.o	\
14
+obj-y			:= debug-monitors.o entry.o irq.o fpsimd.o		\
15
+			   entry-common.o entry-fpsimd.o process.o ptrace.o	\
16
+			   setup.o signal.o sys.o stacktrace.o time.o traps.o	\
17
+			   io.o vdso.o hyp-stub.o psci.o cpu_ops.o insn.o	\
19
18
 			   return_address.o cpuinfo.o cpu_errata.o		\
20
19
 			   cpufeature.o alternative.o cacheinfo.o		\
21
20
 			   smp.o smp_spin_table.o topology.o smccc-call.o	\
22
-			   syscall.o
21
+			   syscall.o proton-pack.o idreg-override.o
23
22
 
24
-extra-$(CONFIG_EFI)			:= efi-entry.o
23
+targets			+= efi-entry.o
25
24
 
26
25
 OBJCOPYFLAGS := --prefix-symbols=__efistub_
27
26
 $(obj)/%.stub.o: $(obj)/%.o FORCE
28
27
 	$(call if_changed,objcopy)
29
28
 
30
-arm64-obj-$(CONFIG_COMPAT)		+= sys32.o signal32.o		 	\
29
+obj-$(CONFIG_COMPAT)			+= sys32.o signal32.o			\
31
30
 					   sys_compat.o
32
-ifneq ($(CONFIG_COMPAT_VDSO), y)
33
-arm64-obj-$(CONFIG_COMPAT)		+= sigreturn32.o
34
-endif
35
-arm64-obj-$(CONFIG_KUSER_HELPERS)	+= kuser32.o
36
-arm64-obj-$(CONFIG_FUNCTION_TRACER)	+= ftrace.o entry-ftrace.o
37
-arm64-obj-$(CONFIG_MODULES)		+= arm64ksyms.o module.o
38
-arm64-obj-$(CONFIG_ARM64_MODULE_PLTS)	+= module-plts.o
39
-arm64-obj-$(CONFIG_PERF_EVENTS)		+= perf_regs.o perf_callchain.o
40
-arm64-obj-$(CONFIG_HW_PERF_EVENTS)	+= perf_event.o
41
-arm64-obj-$(CONFIG_HAVE_HW_BREAKPOINT)	+= hw_breakpoint.o
42
-arm64-obj-$(CONFIG_CPU_PM)		+= sleep.o suspend.o
43
-arm64-obj-$(CONFIG_CPU_IDLE)		+= cpuidle.o
44
-arm64-obj-$(CONFIG_JUMP_LABEL)		+= jump_label.o
45
-arm64-obj-$(CONFIG_KGDB)		+= kgdb.o
46
-arm64-obj-$(CONFIG_EFI)			+= efi.o efi-entry.stub.o		\
31
+obj-$(CONFIG_COMPAT)			+= sigreturn32.o
32
+obj-$(CONFIG_KUSER_HELPERS)		+= kuser32.o
33
+obj-$(CONFIG_FUNCTION_TRACER)		+= ftrace.o entry-ftrace.o
34
+obj-$(CONFIG_MODULES)			+= module.o
35
+obj-$(CONFIG_ARM64_MODULE_PLTS)		+= module-plts.o
36
+obj-$(CONFIG_PERF_EVENTS)		+= perf_regs.o perf_callchain.o
37
+obj-$(CONFIG_HW_PERF_EVENTS)		+= perf_event.o
38
+obj-$(CONFIG_HAVE_HW_BREAKPOINT)	+= hw_breakpoint.o
39
+obj-$(CONFIG_CPU_PM)			+= sleep.o suspend.o
40
+obj-$(CONFIG_CPU_IDLE)			+= cpuidle.o
41
+obj-$(CONFIG_JUMP_LABEL)		+= jump_label.o
42
+obj-$(CONFIG_KGDB)			+= kgdb.o
43
+obj-$(CONFIG_EFI)			+= efi.o efi-entry.stub.o		\
47
44
 					   efi-rt-wrapper.o
48
-arm64-obj-$(CONFIG_PCI)			+= pci.o
49
-arm64-obj-$(CONFIG_ARMV8_DEPRECATED)	+= armv8_deprecated.o
50
-arm64-obj-$(CONFIG_ACPI)		+= acpi.o
51
-arm64-obj-$(CONFIG_ACPI_NUMA)		+= acpi_numa.o
52
-arm64-obj-$(CONFIG_ARM64_ACPI_PARKING_PROTOCOL)	+= acpi_parking_protocol.o
53
-arm64-obj-$(CONFIG_PARAVIRT)		+= paravirt.o
54
-arm64-obj-$(CONFIG_RANDOMIZE_BASE)	+= kaslr.o
55
-arm64-obj-$(CONFIG_HIBERNATION)		+= hibernate.o hibernate-asm.o
56
-arm64-obj-$(CONFIG_KEXEC)		+= machine_kexec.o relocate_kernel.o	\
45
+obj-$(CONFIG_PCI)			+= pci.o
46
+obj-$(CONFIG_ARMV8_DEPRECATED)		+= armv8_deprecated.o
47
+obj-$(CONFIG_ACPI)			+= acpi.o
48
+obj-$(CONFIG_ACPI_NUMA)			+= acpi_numa.o
49
+obj-$(CONFIG_ARM64_ACPI_PARKING_PROTOCOL)	+= acpi_parking_protocol.o
50
+obj-$(CONFIG_PARAVIRT)			+= paravirt.o
51
+obj-$(CONFIG_RANDOMIZE_BASE)		+= kaslr.o
52
+obj-$(CONFIG_HIBERNATION)		+= hibernate.o hibernate-asm.o
53
+obj-$(CONFIG_KEXEC_CORE)		+= machine_kexec.o relocate_kernel.o	\
57
54
 					   cpu-reset.o
58
-arm64-obj-$(CONFIG_ARM64_RELOC_TEST)	+= arm64-reloc-test.o
55
+obj-$(CONFIG_KEXEC_FILE)		+= machine_kexec_file.o kexec_image.o
56
+obj-$(CONFIG_ARM64_RELOC_TEST)		+= arm64-reloc-test.o
59
57
 arm64-reloc-test-y := reloc_test_core.o reloc_test_syms.o
60
-arm64-obj-$(CONFIG_CRASH_DUMP)		+= crash_dump.o
61
-arm64-obj-$(CONFIG_CRASH_CORE)		+= crash_core.o
62
-arm64-obj-$(CONFIG_ARM_SDE_INTERFACE)	+= sdei.o
63
-arm64-obj-$(CONFIG_ARM64_SSBD)		+= ssbd.o
64
-arm64-obj-$(CONFIG_SHADOW_CALL_STACK)	+= scs.o
58
+obj-$(CONFIG_CRASH_DUMP)		+= crash_dump.o
59
+obj-$(CONFIG_CRASH_CORE)		+= crash_core.o
60
+obj-$(CONFIG_ARM_SDE_INTERFACE)		+= sdei.o
61
+obj-$(CONFIG_ARM64_PTR_AUTH)		+= pointer_auth.o
62
+obj-$(CONFIG_ARM64_MTE)			+= mte.o
65
63
 
66
-obj-y					+= $(arm64-obj-y) vdso/ probes/
67
-obj-m					+= $(arm64-obj-m)
64
+obj-y					+= vdso/ probes/
68
65
 obj-$(CONFIG_COMPAT_VDSO)		+= vdso32/
69
66
 head-y					:= head.o
70
67
 extra-y					+= $(head-y) vmlinux.lds