From bc6956f08c225304cfb62b7314a660f52701d30c Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 16 Feb 2020 13:28:47 +0100 Subject: riscv64: use upstream Linux kernel --- target/config/Config.in.abi | 16 ++++++++-------- target/config/Config.in.cpu | 37 +++++++++++++++++++++++++++---------- 2 files changed, 35 insertions(+), 18 deletions(-) (limited to 'target/config') diff --git a/target/config/Config.in.abi b/target/config/Config.in.abi index 1b34ec6e3..14a2dcc63 100644 --- a/target/config/Config.in.abi +++ b/target/config/Config.in.abi @@ -67,11 +67,11 @@ config ADK_TARGET_ABI_RISCV depends on ADK_TARGET_ARCH_RISCV32 || ADK_TARGET_ARCH_RISCV64 string default "lp64" if ADK_TARGET_ABI_LP64 - default "lp64d" if ADK_TARGET_ABI_LP64D default "lp64f" if ADK_TARGET_ABI_LP64F - default "ilp32" if ADK_TARGET_ABI_ILP64 - default "ilp32d" if ADK_TARGET_ABI_ILP64D - default "ilp32f" if ADK_TARGET_ABI_ILP64F + default "lp64d" if ADK_TARGET_ABI_LP64D + default "ilp32" if ADK_TARGET_ABI_ILP32 + default "ilp32f" if ADK_TARGET_ABI_ILP32F + default "ilp32d" if ADK_TARGET_ABI_ILP32D config ADK_TARGET_ABI_MIPS64 depends on ADK_TARGET_ARCH_MIPS64 @@ -94,11 +94,11 @@ config ADK_TARGET_LIBC_PATH config ADK_TARGET_LIBC_ABI_PATH string default "lib/lp64" if ADK_TARGET_ABI_LP64 - default "lib/lp64d" if ADK_TARGET_ABI_LP64D default "lib/lp64f" if ADK_TARGET_ABI_LP64F - default "lib/ilp32" if ADK_TARGET_ABI_ILP64 - default "lib/ilp32d" if ADK_TARGET_ABI_ILP64D - default "lib/ilp32f" if ADK_TARGET_ABI_ILP64F + default "lib/lp64d" if ADK_TARGET_ABI_LP64D + default "lib/ilp32" if ADK_TARGET_ABI_ILP32 + default "lib/ilp32f" if ADK_TARGET_ABI_ILP32F + default "lib/ilp32d" if ADK_TARGET_ABI_ILP32D default "lib" config ADK_TARGET_ABI_CFLAGS diff --git a/target/config/Config.in.cpu b/target/config/Config.in.cpu index be8cdb1e9..59cc63657 100644 --- a/target/config/Config.in.cpu +++ b/target/config/Config.in.cpu @@ -1093,29 +1093,29 @@ config ADK_TARGET_CPU_PPC64_POWERPC64 depends on ADK_TARGET_BIG_ENDIAN # riscv -config ADK_TARGET_CPU_RISCV32_RV32IMAFDC - bool "rv32imafdc" +config ADK_TARGET_CPU_RISCV32_RV32IMAC + bool "rv32imac" select ADK_TARGET_SUPPORTS_THREADS select ADK_TARGET_SUPPORTS_NPTL select ADK_TARGET_WITH_MMU - select ADK_TARGET_ABI_ILP32D + select ADK_TARGET_ABI_ILP32 depends on ADK_TARGET_ARCH_RISCV32 -config ADK_TARGET_CPU_RISCV32_RV32IMAC - bool "rv32imac" +config ADK_TARGET_CPU_RISCV32_RV32IMAFC + bool "rv32imafc" select ADK_TARGET_SUPPORTS_THREADS select ADK_TARGET_SUPPORTS_NPTL select ADK_TARGET_WITH_MMU - select ADK_TARGET_ABI_ILP32 + select ADK_TARGET_ABI_ILP32F depends on ADK_TARGET_ARCH_RISCV32 -config ADK_TARGET_CPU_RISCV64_RV64IMAFDC - bool "rv64imafdc" +config ADK_TARGET_CPU_RISCV32_RV32IMADC + bool "rv32imadc" select ADK_TARGET_SUPPORTS_THREADS select ADK_TARGET_SUPPORTS_NPTL select ADK_TARGET_WITH_MMU - select ADK_TARGET_ABI_LP64D - depends on ADK_TARGET_ARCH_RISCV64 + select ADK_TARGET_ABI_ILP32D + depends on ADK_TARGET_ARCH_RISCV32 config ADK_TARGET_CPU_RISCV64_RV64IMAC bool "rv64imac" @@ -1125,6 +1125,23 @@ config ADK_TARGET_CPU_RISCV64_RV64IMAC select ADK_TARGET_ABI_LP64 depends on ADK_TARGET_ARCH_RISCV64 +config ADK_TARGET_CPU_RISCV64_RV64IMAFC + bool "rv64imafc" + select ADK_TARGET_SUPPORTS_THREADS + select ADK_TARGET_SUPPORTS_NPTL + select ADK_TARGET_WITH_MMU + select ADK_TARGET_ABI_LP64F + depends on ADK_TARGET_ARCH_RISCV64 + +config ADK_TARGET_CPU_RISCV64_RV64IMADC + bool "rv64imadc" + select ADK_TARGET_SUPPORTS_THREADS + select ADK_TARGET_SUPPORTS_NPTL + select ADK_TARGET_WITH_MMU + select ADK_TARGET_ABI_LP64D + depends on ADK_TARGET_ARCH_RISCV64 + + # rx config ADK_TARGET_CPU_RX bool "rx" -- cgit v1.2.3