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 --- Kconfig | 2 -- cmd/Kconfig | 3 +++ scripts/Kconfig | 2 -- 3 files changed, 3 insertions(+), 4 deletions(-) delete mode 100644 scripts/Kconfig

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 d6d130edfa..1db74f8f50 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