@@ -43,6 +43,7 @@ cc-option = $(call __cc-option, $(CC),$(CLANG_CROSS_FLAGS),$(1),$(2))
43
43
# configure default variants for target kernel supported architectures
44
44
XARCH_powerpc = ppc
45
45
XARCH_mips = mips32le
46
+ XARCH_riscv = riscv64
46
47
XARCH = $(or $(XARCH_$(ARCH ) ) ,$(ARCH ) )
47
48
48
49
# map from user input variants to their kernel supported architectures
@@ -51,6 +52,7 @@ ARCH_ppc64 = powerpc
51
52
ARCH_ppc64le = powerpc
52
53
ARCH_mips32le = mips
53
54
ARCH_mips32be = mips
55
+ ARCH_riscv64 = riscv
54
56
ARCH := $(or $(ARCH_$(XARCH ) ) ,$(XARCH ) )
55
57
56
58
# kernel image names by architecture
@@ -65,6 +67,7 @@ IMAGE_ppc = vmlinux
65
67
IMAGE_ppc64 = vmlinux
66
68
IMAGE_ppc64le = arch/powerpc/boot/zImage
67
69
IMAGE_riscv = arch/riscv/boot/Image
70
+ IMAGE_riscv64 = arch/riscv/boot/Image
68
71
IMAGE_s390 = arch/s390/boot/bzImage
69
72
IMAGE_loongarch = arch/loongarch/boot/vmlinuz.efi
70
73
IMAGE = $(objtree ) /$(IMAGE_$(XARCH ) )
@@ -82,6 +85,7 @@ DEFCONFIG_ppc = pmac32_defconfig
82
85
DEFCONFIG_ppc64 = powernv_be_defconfig
83
86
DEFCONFIG_ppc64le = powernv_defconfig
84
87
DEFCONFIG_riscv = defconfig
88
+ DEFCONFIG_riscv64 = defconfig
85
89
DEFCONFIG_s390 = defconfig
86
90
DEFCONFIG_loongarch = defconfig
87
91
DEFCONFIG = $(DEFCONFIG_$(XARCH ) )
@@ -104,6 +108,7 @@ QEMU_ARCH_ppc = ppc
104
108
QEMU_ARCH_ppc64 = ppc64
105
109
QEMU_ARCH_ppc64le = ppc64
106
110
QEMU_ARCH_riscv = riscv64
111
+ QEMU_ARCH_riscv64 = riscv64
107
112
QEMU_ARCH_s390 = s390x
108
113
QEMU_ARCH_loongarch = loongarch64
109
114
QEMU_ARCH = $(QEMU_ARCH_$(XARCH ) )
@@ -130,6 +135,7 @@ QEMU_ARGS_ppc = -M g3beige -append "console=ttyS0 panic=-1 $(TEST:%=NOLIB
130
135
QEMU_ARGS_ppc64 = -M powernv -append "console=hvc0 panic=-1 $(TEST:%=NOLIBC_TEST=% ) "
131
136
QEMU_ARGS_ppc64le = -M powernv -append "console=hvc0 panic=-1 $(TEST:%=NOLIBC_TEST=% ) "
132
137
QEMU_ARGS_riscv = -M virt -append "console=ttyS0 panic=-1 $(TEST:%=NOLIBC_TEST=% ) "
138
+ QEMU_ARGS_riscv64 = -M virt -append "console=ttyS0 panic=-1 $(TEST:%=NOLIBC_TEST=% ) "
133
139
QEMU_ARGS_s390 = -M s390-ccw-virtio -append "console=ttyS0 panic=-1 $(TEST:%=NOLIBC_TEST=% ) "
134
140
QEMU_ARGS_loongarch = -M virt -append "console=ttyS0,115200 panic=-1 $(TEST:%=NOLIBC_TEST=% ) "
135
141
QEMU_ARGS = -m 1G $(QEMU_ARGS_$(XARCH ) ) $(QEMU_ARGS_BIOS ) $(QEMU_ARGS_EXTRA )
0 commit comments