aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitmodules2
-rw-r--r--Makefile4
m---------tools/kconfig (renamed from kconfig)0
3 files changed, 3 insertions, 3 deletions
diff --git a/.gitmodules b/.gitmodules
index beb1370..c631d26 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,5 +1,5 @@
[submodule "kconfig"]
- path = kconfig
+ path = tools/kconfig
url = https://github.com/guillon/kconfig.git
[submodule "tests/simavr"]
path = tests/simavr
diff --git a/Makefile b/Makefile
index 67aaf49..4f8da62 100644
--- a/Makefile
+++ b/Makefile
@@ -124,8 +124,8 @@ MAKEOVERRIDES =
callconfig = $(Q)\
[ ! -f "$(CONFIG)" ] || mv "$(CONFIG)" config; \
- IOEROOT=. $(MAKE) -f kconfig/GNUmakefile --no-print-directory \
- TOPDIR=. SRCDIR=kconfig $(1); \
+ IOEROOT=. $(MAKE) -f tools/kconfig/GNUmakefile --no-print-directory \
+ TOPDIR=. SRCDIR=tools/kconfig $(1); \
[ ! -f config ] || mv config "$(CONFIG)"; \
[ ! -f config.old ] || mv config.old "$(CONFIG).old"
# Note about this file moving madness:
diff --git a/kconfig b/tools/kconfig
-Subproject 6814159a0a618a145aa5786a0ec3d311ce81ee9
+Subproject 6814159a0a618a145aa5786a0ec3d311ce81ee9