summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Protsenko <semen.protsenko@linaro.org>2017-09-28 12:33:45 -0700
committerTom Rini <trini@konsulko.com>2017-10-08 16:19:56 -0400
commit610eec7f0593574c034054ba54fc1c934755e208 (patch)
tree0c1473538f40b714f2b66d4fa1b844a876913d64
parent9a212d7f553d01a45172da34970e3a7d481302fd (diff)
scripts: Move Kconfig contents to cmd/Kconfig
On case-insensitive file systems we have collision between scripts/kconfig/ directory and scripts/Kconfig file. This patch moves scripts/Kcofnig contents to cmd/Kconfig to fix that. Signed-off-by: Sam Protsenko <semen.protsenko@linaro.org> Acked-by: Masahiro Yamada <yamada.masahiro@socionext.com>
-rw-r--r--Kconfig2
-rw-r--r--cmd/Kconfig3
-rw-r--r--scripts/Kconfig2
3 files changed, 3 insertions, 4 deletions
diff --git a/Kconfig b/Kconfig
index 238fa3e1ed..d951e9f804 100644
--- a/Kconfig
+++ b/Kconfig
@@ -398,5 +398,3 @@ source "fs/Kconfig"
source "lib/Kconfig"
source "test/Kconfig"
-
-source "scripts/Kconfig"
diff --git a/cmd/Kconfig b/cmd/Kconfig
index 28c91ca181..bc4f72679e 100644
--- a/cmd/Kconfig
+++ b/cmd/Kconfig
@@ -116,6 +116,9 @@ endmenu
source "cmd/fastboot/Kconfig"
+config BUILD_BIN2C
+ bool
+
comment "Commands"
menu "Info commands"
diff --git a/scripts/Kconfig b/scripts/Kconfig
deleted file mode 100644
index 2a2c18e96e..0000000000
--- a/scripts/Kconfig
+++ /dev/null
@@ -1,2 +0,0 @@
-config BUILD_BIN2C
- bool