Skip to content

Commit a47b4b9

Browse files
committed
selftests/nolibc: rename riscv to riscv64
riscv32 support is about the be added. To keep the naming clear and consistent with other architectures rename riscv to riscv64, as that is what it actually represents. Link: https://lore.kernel.org/r/20241221-nolibc-rv32-v1-5-d9ef6dab7c63@weissschuh.net Signed-off-by: Thomas Weißschuh <linux@weissschuh.net>
1 parent 349afc8 commit a47b4b9

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

tools/testing/selftests/nolibc/Makefile

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ cc-option = $(call __cc-option, $(CC),$(CLANG_CROSS_FLAGS),$(1),$(2))
4343
# configure default variants for target kernel supported architectures
4444
XARCH_powerpc = ppc
4545
XARCH_mips = mips32le
46+
XARCH_riscv = riscv64
4647
XARCH = $(or $(XARCH_$(ARCH)),$(ARCH))
4748

4849
# map from user input variants to their kernel supported architectures
@@ -51,6 +52,7 @@ ARCH_ppc64 = powerpc
5152
ARCH_ppc64le = powerpc
5253
ARCH_mips32le = mips
5354
ARCH_mips32be = mips
55+
ARCH_riscv64 = riscv
5456
ARCH := $(or $(ARCH_$(XARCH)),$(XARCH))
5557

5658
# kernel image names by architecture
@@ -65,6 +67,7 @@ IMAGE_ppc = vmlinux
6567
IMAGE_ppc64 = vmlinux
6668
IMAGE_ppc64le = arch/powerpc/boot/zImage
6769
IMAGE_riscv = arch/riscv/boot/Image
70+
IMAGE_riscv64 = arch/riscv/boot/Image
6871
IMAGE_s390 = arch/s390/boot/bzImage
6972
IMAGE_loongarch = arch/loongarch/boot/vmlinuz.efi
7073
IMAGE = $(objtree)/$(IMAGE_$(XARCH))
@@ -82,6 +85,7 @@ DEFCONFIG_ppc = pmac32_defconfig
8285
DEFCONFIG_ppc64 = powernv_be_defconfig
8386
DEFCONFIG_ppc64le = powernv_defconfig
8487
DEFCONFIG_riscv = defconfig
88+
DEFCONFIG_riscv64 = defconfig
8589
DEFCONFIG_s390 = defconfig
8690
DEFCONFIG_loongarch = defconfig
8791
DEFCONFIG = $(DEFCONFIG_$(XARCH))
@@ -104,6 +108,7 @@ QEMU_ARCH_ppc = ppc
104108
QEMU_ARCH_ppc64 = ppc64
105109
QEMU_ARCH_ppc64le = ppc64
106110
QEMU_ARCH_riscv = riscv64
111+
QEMU_ARCH_riscv64 = riscv64
107112
QEMU_ARCH_s390 = s390x
108113
QEMU_ARCH_loongarch = loongarch64
109114
QEMU_ARCH = $(QEMU_ARCH_$(XARCH))
@@ -130,6 +135,7 @@ QEMU_ARGS_ppc = -M g3beige -append "console=ttyS0 panic=-1 $(TEST:%=NOLIB
130135
QEMU_ARGS_ppc64 = -M powernv -append "console=hvc0 panic=-1 $(TEST:%=NOLIBC_TEST=%)"
131136
QEMU_ARGS_ppc64le = -M powernv -append "console=hvc0 panic=-1 $(TEST:%=NOLIBC_TEST=%)"
132137
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=%)"
133139
QEMU_ARGS_s390 = -M s390-ccw-virtio -append "console=ttyS0 panic=-1 $(TEST:%=NOLIBC_TEST=%)"
134140
QEMU_ARGS_loongarch = -M virt -append "console=ttyS0,115200 panic=-1 $(TEST:%=NOLIBC_TEST=%)"
135141
QEMU_ARGS = -m 1G $(QEMU_ARGS_$(XARCH)) $(QEMU_ARGS_BIOS) $(QEMU_ARGS_EXTRA)

tools/testing/selftests/nolibc/run-tests.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ perform_download=0
1717
test_mode=system
1818
werror=1
1919
llvm=
20-
archs="i386 x86_64 arm64 arm mips32le mips32be ppc ppc64 ppc64le riscv s390 loongarch"
20+
archs="i386 x86_64 arm64 arm mips32le mips32be ppc ppc64 ppc64le riscv64 s390 loongarch"
2121

2222
TEMP=$(getopt -o 'j:d:c:b:a:m:pelh' -n "$0" -- "$@")
2323

0 commit comments

Comments
 (0)