From 9783dd07ab1259cde1716a67d82c5752c3acf582 Mon Sep 17 00:00:00 2001 From: Martin Kroeker Date: Sun, 6 Oct 2024 22:43:11 +0200 Subject: [PATCH 1/3] Rename KERNEL.LOONGSONGENERIC to KERNEL.LA64_GENERIC --- .../loongarch64/{KERNEL.LOONGSONGENERIC => KERNEL.LA64_GENERIC} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename kernel/loongarch64/{KERNEL.LOONGSONGENERIC => KERNEL.LA64_GENERIC} (100%) diff --git a/kernel/loongarch64/KERNEL.LOONGSONGENERIC b/kernel/loongarch64/KERNEL.LA64_GENERIC similarity index 100% rename from kernel/loongarch64/KERNEL.LOONGSONGENERIC rename to kernel/loongarch64/KERNEL.LA64_GENERIC From 9c707dc6b9845e8df25a70e67f5a07ee1ca7332b Mon Sep 17 00:00:00 2001 From: Martin Kroeker Date: Sun, 6 Oct 2024 22:46:03 +0200 Subject: [PATCH 2/3] Update dynamic arch list to new target scheme --- cmake/arch.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/arch.cmake b/cmake/arch.cmake index 0ff4f1df31..27ba6f8727 100644 --- a/cmake/arch.cmake +++ b/cmake/arch.cmake @@ -95,7 +95,7 @@ if (DYNAMIC_ARCH) endif () if (LOONGARCH64) - set(DYNAMIC_CORE LOONGSONGENERIC LOONGSON2K1000 LOONGSON3R5) + set(DYNAMIC_CORE LA64_GENERIC LA264 LA464) endif () if (EXISTS ${PROJECT_SOURCE_DIR}/config_kernel.h) From b0346e72f48515d30683d69cada17bdabe4d80ee Mon Sep 17 00:00:00 2001 From: Martin Kroeker Date: Sun, 6 Oct 2024 22:48:33 +0200 Subject: [PATCH 3/3] update names of loongarch64 targets for cross-compilation --- cmake/prebuild.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cmake/prebuild.cmake b/cmake/prebuild.cmake index 785c275c78..53a78d782f 100644 --- a/cmake/prebuild.cmake +++ b/cmake/prebuild.cmake @@ -1349,7 +1349,7 @@ endif () "#define DTB_DEFAULT_ENTRIES 128\n" "#define DTB_SIZE 4096\n" "#define L2_ASSOCIATIVE 4\n") - elseif ("${TCORE}" STREQUAL "LOONGSONGENERIC") + elseif ("${TCORE}" STREQUAL "LA64_GENERIC") file(APPEND ${TARGET_CONF_TEMP} "#define DTB_DEFAULT_ENTRIES 64\n") set(SGEMM_UNROLL_M 2) @@ -1364,7 +1364,7 @@ endif () set(CGEMM3M_UNROLL_N 8) set(ZGEMM3M_UNROLL_M 2) set(ZGEMM3M_UNROLL_N 8) - elseif ("${TCORE}" STREQUAL "LOONGSON2K1000") + elseif ("${TCORE}" STREQUAL "LA264") file(APPEND ${TARGET_CONF_TEMP} "#define DTB_DEFAULT_ENTRIES 64\n") set(HAVE_LSX 1) @@ -1380,7 +1380,7 @@ endif () set(CGEMM3M_UNROLL_N 8) set(ZGEMM3M_UNROLL_M 8) set(ZGEMM3M_UNROLL_N 4) - elseif ("${TCORE}" STREQUAL "LOONGSON3R5") + elseif ("${TCORE}" STREQUAL "LA464") file(APPEND ${TARGET_CONF_TEMP} "#define DTB_DEFAULT_ENTRIES 64\n") set(HAVE_LASX 1)