write in 30M

hc

2024-02-20 ea08eeccae9297f7aabd2ef7f0c2517ac4549acc

 kernel/arch/riscv/Makefile
..
..
@@ -13,10 +13,10 @@
13
13
 ifeq ($(CONFIG_DYNAMIC_FTRACE),y)
14
14
 	LDFLAGS_vmlinux := --no-relax
15
15
 endif
16
-KBUILD_AFLAGS_MODULE += -fPIC
17
-KBUILD_CFLAGS_MODULE += -fPIC
18
16
 
19
-KBUILD_DEFCONFIG = defconfig
17
+ifeq ($(CONFIG_CMODEL_MEDLOW),y)
18
+KBUILD_CFLAGS_MODULE += -mcmodel=medany
19
+endif
20
20
 
21
21
 export BITS
22
22
 ifeq ($(CONFIG_ARCH_RV64I),y)
..
..
@@ -25,10 +25,7 @@
25
25
 
26
26
 	KBUILD_CFLAGS += -mabi=lp64
27
27
 	KBUILD_AFLAGS += -mabi=lp64
28
-	
29
-	KBUILD_CFLAGS	+= $(call cc-ifversion, -ge, 0500, -DCONFIG_ARCH_SUPPORTS_INT128)
30
28
 
31
-	KBUILD_MARCH = rv64im
32
29
 	KBUILD_LDFLAGS += -melf64lriscv
33
30
 else
34
31
 	BITS := 32
..
..
@@ -36,22 +33,36 @@
36
33
 
37
34
 	KBUILD_CFLAGS += -mabi=ilp32
38
35
 	KBUILD_AFLAGS += -mabi=ilp32
39
-	KBUILD_MARCH = rv32im
40
36
 	KBUILD_LDFLAGS += -melf32lriscv
41
37
 endif
42
38
 
43
-KBUILD_CFLAGS += -Wall
44
-
45
-ifeq ($(CONFIG_RISCV_ISA_A),y)
46
-	KBUILD_ARCH_A = a
39
+ifeq ($(CONFIG_LD_IS_LLD),y)
40
+ifeq ($(shell test $(CONFIG_LLD_VERSION) -lt 150000; echo $$?),0)
41
+	KBUILD_CFLAGS += -mno-relax
42
+	KBUILD_AFLAGS += -mno-relax
43
+ifndef CONFIG_AS_IS_LLVM
44
+	KBUILD_CFLAGS += -Wa,-mno-relax
45
+	KBUILD_AFLAGS += -Wa,-mno-relax
47
46
 endif
48
-ifeq ($(CONFIG_RISCV_ISA_C),y)
49
-	KBUILD_ARCH_C = c
47
+endif
50
48
 endif
51
49
 
52
-KBUILD_AFLAGS += -march=$(KBUILD_MARCH)$(KBUILD_ARCH_A)fd$(KBUILD_ARCH_C)
50
+# ISA string setting
51
+riscv-march-$(CONFIG_ARCH_RV32I)	:= rv32ima
52
+riscv-march-$(CONFIG_ARCH_RV64I)	:= rv64ima
53
+riscv-march-$(CONFIG_FPU)		:= $(riscv-march-y)fd
54
+riscv-march-$(CONFIG_RISCV_ISA_C)	:= $(riscv-march-y)c
53
55
 
54
-KBUILD_CFLAGS += -march=$(KBUILD_MARCH)$(KBUILD_ARCH_A)$(KBUILD_ARCH_C)
56
+ifdef CONFIG_TOOLCHAIN_NEEDS_OLD_ISA_SPEC
57
+KBUILD_CFLAGS += -Wa,-misa-spec=2.2
58
+KBUILD_AFLAGS += -Wa,-misa-spec=2.2
59
+else
60
+riscv-march-$(CONFIG_TOOLCHAIN_NEEDS_EXPLICIT_ZICSR_ZIFENCEI) := $(riscv-march-y)_zicsr_zifencei
61
+endif
62
+
63
+KBUILD_CFLAGS += -march=$(subst fd,,$(riscv-march-y))
64
+KBUILD_AFLAGS += -march=$(riscv-march-y)
65
+
55
66
 KBUILD_CFLAGS += -mno-save-restore
56
67
 KBUILD_CFLAGS += -DCONFIG_PAGE_OFFSET=$(CONFIG_PAGE_OFFSET)
57
68
 
..
..
@@ -61,11 +72,15 @@
61
72
 ifeq ($(CONFIG_CMODEL_MEDANY),y)
62
73
 	KBUILD_CFLAGS += -mcmodel=medany
63
74
 endif
64
-ifeq ($(CONFIG_MODULE_SECTIONS),y)
65
-	KBUILD_LDFLAGS_MODULE += -T $(srctree)/arch/riscv/kernel/module.lds
75
+ifeq ($(CONFIG_PERF_EVENTS),y)
76
+        KBUILD_CFLAGS += -fno-omit-frame-pointer
66
77
 endif
67
78
 
79
+# Avoid generating .eh_frame sections.
80
+KBUILD_CFLAGS += -fno-asynchronous-unwind-tables -fno-unwind-tables
81
+
68
82
 KBUILD_CFLAGS_MODULE += $(call cc-option,-mno-relax)
83
+KBUILD_AFLAGS_MODULE += $(call as-option,-Wa$(comma)-mno-relax)
69
84
 
70
85
 # GCC versions that support the "-mstrict-align" option default to allowing
71
86
 # unaligned accesses.  While unaligned accesses are explicitly allowed in the
..
..
@@ -76,14 +91,33 @@
76
91
 # arch specific predefines for sparse
77
92
 CHECKFLAGS += -D__riscv -D__riscv_xlen=$(BITS)
78
93
 
94
+# Default target when executing plain make
95
+boot		:= arch/riscv/boot
96
+KBUILD_IMAGE	:= $(boot)/Image.gz
97
+
79
98
 head-y := arch/riscv/kernel/head.o
80
99
 
81
-core-y += arch/riscv/kernel/ arch/riscv/mm/
100
+core-y += arch/riscv/
82
101
 
83
102
 libs-y += arch/riscv/lib/
103
+libs-$(CONFIG_EFI_STUB) += $(objtree)/drivers/firmware/efi/libstub/lib.a
84
104
 
85
105
 PHONY += vdso_install
86
106
 vdso_install:
87
107
 	$(Q)$(MAKE) $(build)=arch/riscv/kernel/vdso $@
88
108
 
89
-all: vmlinux
109
+ifeq ($(CONFIG_RISCV_M_MODE)$(CONFIG_SOC_KENDRYTE),yy)
110
+KBUILD_IMAGE := $(boot)/loader.bin
111
+else
112
+KBUILD_IMAGE := $(boot)/Image.gz
113
+endif
114
+BOOT_TARGETS := Image Image.gz loader loader.bin
115
+
116
+all:	$(notdir $(KBUILD_IMAGE))
117
+
118
+$(BOOT_TARGETS): vmlinux
119
+	$(Q)$(MAKE) $(build)=$(boot) $(boot)/$@
120
+	@$(kecho) '  Kernel: $(boot)/$@ is ready'
121
+
122
+zinstall install:
123
+	$(Q)$(MAKE) $(build)=$(boot) $@