1 files changed, 32 insertions, 28 deletions
diff --git a/target/config/Config.in.abi b/target/config/Config.in.abi
index 1871728f5..67eacf274 100644
--- a/target/config/Config.in.abi
+++ b/target/config/Config.in.abi
@@ -18,46 +18,40 @@ endchoice
 
 choice
 prompt "ABI"
-depends on ADK_TARGET_ARCH_RISCV32
+depends on ADK_TARGET_ARCH_X86_64 && \
+	(ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_MUSL)
+
+config ADK_TARGET_ABI_64
+	bool "64 Bit ABI"
+
+config ADK_TARGET_ABI_X32
+	bool "x32 ABI"
+
+endchoice
 
 config ADK_TARGET_ABI_ILP32
-	bool "ilp32 ABI"
+	bool
+	depends on ADK_TARGET_ARCH_RISCV32
 
 config ADK_TARGET_ABI_ILP32F
-	bool "ilp32f ABI"
+	bool
+	depends on ADK_TARGET_ARCH_RISCV32
 
 config ADK_TARGET_ABI_ILP32D
-	bool "ilp32d ABI"
-
-endchoice
-
-choice
-prompt "ABI"
-depends on ADK_TARGET_ARCH_RISCV64
+	bool
+	depends on ADK_TARGET_ARCH_RISCV32
 
 config ADK_TARGET_ABI_LP64
-	bool "lp64 ABI"
+	bool
+	depends on ADK_TARGET_ARCH_RISCV64
 
 config ADK_TARGET_ABI_LP64F
-	bool "lp64f ABI"
+	bool
+	depends on ADK_TARGET_ARCH_RISCV64
 
 config ADK_TARGET_ABI_LP64D
-	bool "lp64d ABI"
-
-endchoice
-
-choice
-prompt "ABI"
-depends on ADK_TARGET_ARCH_X86_64 && \
-	(ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_MUSL)
-
-config ADK_TARGET_ABI_64
-	bool "64 Bit ABI"
-
-config ADK_TARGET_ABI_X32
-	bool "x32 ABI"
-
-endchoice
+	bool
+	depends on ADK_TARGET_ARCH_RISCV64
 
 config ADK_TARGET_ABI
 	string
@@ -69,6 +63,16 @@ config ADK_TARGET_ABI
 	default "eabihf" if ADK_TARGET_ARCH_ARM && ADK_TARGET_HARD_FLOAT
 	default "eabi" if ADK_TARGET_ARCH_ARM
 
+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
+
 config ADK_TARGET_MIPS_ABI
 	depends on ADK_TARGET_ARCH_MIPS64
 	string