Makefile: Use variables defined for Kconfig

Change-Id: I72df5fef187e12d1c3c2409449dc9d9b7b80a5e2
Signed-off-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Reviewed-on: http://review.coreboot.org/10709
Tested-by: build bot (Jenkins)
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
diff --git a/Makefile b/Makefile
index aa9ccf9..85a10c0 100644
--- a/Makefile
+++ b/Makefile
@@ -93,7 +93,7 @@
 
 # This include must come _before_ the pattern rules below!
 # Order _does_ matter for pattern rules.
-include util/kconfig/Makefile
+include $(srck)/Makefile
 
 # Three cases where we don't need fully populated $(obj) lists:
 # 1. when no .config exists
@@ -248,7 +248,7 @@
 endif
 
 ifndef NOMKDIR
-$(shell mkdir -p $(KCONFIG_SPLITCONFIG) $(objutil)/kconfig/lxdialog $(additional-dirs) $(alldirs))
+$(shell mkdir -p $(KCONFIG_SPLITCONFIG) $(objk)/lxdialog $(additional-dirs) $(alldirs))
 endif
 
 cscope: