]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
scripts: Move Kconfig contents to cmd/Kconfig
authorSam Protsenko <semen.protsenko@linaro.org>
Thu, 28 Sep 2017 19:33:45 +0000 (12:33 -0700)
committerTom Rini <trini@konsulko.com>
Sun, 8 Oct 2017 20:19:56 +0000 (16:19 -0400)
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>
Kconfig
cmd/Kconfig
scripts/Kconfig [deleted file]

diff --git a/Kconfig b/Kconfig
index 238fa3e1ed46caa14002bd8cb80dfceadea33d89..d951e9f8049203cf5c2cd7af0f30aa615e2da4d5 100644 (file)
--- a/Kconfig
+++ b/Kconfig
@@ -398,5 +398,3 @@ source "fs/Kconfig"
 source "lib/Kconfig"
 
 source "test/Kconfig"
-
-source "scripts/Kconfig"
index 28c91ca181f47c0341b4dffd72c94ed391a80371..bc4f72679e1077dd8cc54e6fc7f98d7dafb11da4 100644 (file)
@@ -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 (file)
index 2a2c18e..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-config BUILD_BIN2C
-       bool