Commit a47b4b9f authored by Thomas Weißschuh's avatar Thomas Weißschuh
Browse files

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: default avatarThomas Weißschuh <linux@weissschuh.net>
parent 349afc8a

tools/testing/selftests/nolibc/Makefile

+6 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ cc-option = $(call __cc-option, $(CC),$(CLANG_CROSS_FLAGS),$(1),$(2)) 
# configure default variants for target kernel supported architectures

XARCH_powerpc    = ppc

XARCH_mips       = mips32le

XARCH_riscv      = riscv64

XARCH            = $(or $(XARCH_$(ARCH)),$(ARCH))



# map from user input variants to their kernel supported architectures
@@ -51,6 +52,7 @@ ARCH_ppc64 = powerpc 
ARCH_ppc64le     = powerpc

ARCH_mips32le    = mips

ARCH_mips32be    = mips

ARCH_riscv64     = riscv

ARCH            := $(or $(ARCH_$(XARCH)),$(XARCH))



# kernel image names by architecture
@@ -65,6 +67,7 @@ IMAGE_ppc = vmlinux 
IMAGE_ppc64      = vmlinux

IMAGE_ppc64le    = arch/powerpc/boot/zImage

IMAGE_riscv      = arch/riscv/boot/Image

IMAGE_riscv64    = arch/riscv/boot/Image

IMAGE_s390       = arch/s390/boot/bzImage

IMAGE_loongarch  = arch/loongarch/boot/vmlinuz.efi

IMAGE            = $(objtree)/$(IMAGE_$(XARCH))
@@ -82,6 +85,7 @@ DEFCONFIG_ppc = pmac32_defconfig 
DEFCONFIG_ppc64      = powernv_be_defconfig

DEFCONFIG_ppc64le    = powernv_defconfig

DEFCONFIG_riscv      = defconfig

DEFCONFIG_riscv64    = defconfig

DEFCONFIG_s390       = defconfig

DEFCONFIG_loongarch  = defconfig

DEFCONFIG            = $(DEFCONFIG_$(XARCH))
@@ -104,6 +108,7 @@ QEMU_ARCH_ppc = ppc 
QEMU_ARCH_ppc64      = ppc64

QEMU_ARCH_ppc64le    = ppc64

QEMU_ARCH_riscv      = riscv64

QEMU_ARCH_riscv64    = riscv64

QEMU_ARCH_s390       = s390x

QEMU_ARCH_loongarch  = loongarch64

QEMU_ARCH            = $(QEMU_ARCH_$(XARCH))
@@ -130,6 +135,7 @@ QEMU_ARGS_ppc = -M g3beige -append "console=ttyS0 panic=-1 $(TEST:%=NOLIB 
QEMU_ARGS_ppc64      = -M powernv -append "console=hvc0 panic=-1 $(TEST:%=NOLIBC_TEST=%)"

QEMU_ARGS_ppc64le    = -M powernv -append "console=hvc0 panic=-1 $(TEST:%=NOLIBC_TEST=%)"

QEMU_ARGS_riscv      = -M virt -append "console=ttyS0 panic=-1 $(TEST:%=NOLIBC_TEST=%)"

QEMU_ARGS_riscv64    = -M virt -append "console=ttyS0 panic=-1 $(TEST:%=NOLIBC_TEST=%)"

QEMU_ARGS_s390       = -M s390-ccw-virtio -append "console=ttyS0 panic=-1 $(TEST:%=NOLIBC_TEST=%)"

QEMU_ARGS_loongarch  = -M virt -append "console=ttyS0,115200 panic=-1 $(TEST:%=NOLIBC_TEST=%)"

QEMU_ARGS            = -m 1G $(QEMU_ARGS_$(XARCH)) $(QEMU_ARGS_BIOS) $(QEMU_ARGS_EXTRA)

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

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ perform_download=0 
test_mode=system

werror=1

llvm=

archs="i386 x86_64 arm64 arm mips32le mips32be ppc ppc64 ppc64le riscv s390 loongarch"

archs="i386 x86_64 arm64 arm mips32le mips32be ppc ppc64 ppc64le riscv64 s390 loongarch"



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