From 24c9fa3cd9f569ac4f4cd411e6272d80d2ed7d56 Mon Sep 17 00:00:00 2001
From: YAMAMOTO Takashi <yamamoto@midokura.com>
Date: Thu, 26 Mar 2020 12:24:42 +0900
Subject: [PATCH] Kconfig: Move ELF_64BIT out of !BINFMT_DISABLE

Because it's also used by LIBC_MODLIB.
---
 binfmt/Kconfig        | 7 +++++++
 binfmt/libelf/Kconfig | 6 ------
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/binfmt/Kconfig b/binfmt/Kconfig
index 15e878af370..300a137b097 100644
--- a/binfmt/Kconfig
+++ b/binfmt/Kconfig
@@ -10,6 +10,13 @@ config BINFMT_DISABLE
 		By default, support for loadable binary formats is built.  This logic
 		may be suppressed be defining this setting.
 
+config ELF_64BIT
+	bool "64bit ELF support"
+	default n
+	depends on (!BINFMT_DISABLE && ELF) || LIBC_MODLIB
+	---help---
+		This option is used to load 64bit ELF files
+
 if !BINFMT_DISABLE
 
 config PATH_INITIAL
diff --git a/binfmt/libelf/Kconfig b/binfmt/libelf/Kconfig
index 3d13c71c9d1..859ae669bca 100644
--- a/binfmt/libelf/Kconfig
+++ b/binfmt/libelf/Kconfig
@@ -3,12 +3,6 @@
 # see the file kconfig-language.txt in the NuttX tools repository.
 #
 
-config ELF_64BIT
-	bool "64bit ELF support"
-	default n
-	---help---
-		This option is used to load 64bit ELF files
-
 config ELF_ALIGN_LOG2
 	int "Log2 Section Alignment"
 	default 2