diff options
| author | Stefan Reinauer <stefan.reinauer@coreboot.org> | 2015-06-11 14:57:36 -0700 |
|---|---|---|
| committer | Stefan Reinauer <stefan.reinauer@coreboot.org> | 2015-06-30 18:55:32 +0200 |
| commit | ed56499ab145dc3dec1ee65693fe4b5d2f4a973f (patch) | |
| tree | 84029598955d7ccb68ef365a7b0ccbda0d516567 /payloads/libpayload/Makefile | |
| parent | 1b4d39428eac80bc76713b1f21a2c85e8900c1b8 (diff) | |
libpayload: Drop duplicate copy of Kconfig
It's perfectly fine to have one single copy of kconfig in the tree.
Change-Id: Icfe32f0249dfc1c223009d6e7136462f8f8a7248
Signed-off-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Reviewed-on: http://review.coreboot.org/10521
Tested-by: build bot (Jenkins)
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
Diffstat (limited to 'payloads/libpayload/Makefile')
| -rw-r--r-- | payloads/libpayload/Makefile | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/payloads/libpayload/Makefile b/payloads/libpayload/Makefile index 1097ce5014..dd538dd048 100644 --- a/payloads/libpayload/Makefile +++ b/payloads/libpayload/Makefile @@ -45,14 +45,19 @@ endif export top := $(CURDIR) export src := src -export srck := $(top)/util/kconfig +export srck := $(top)/../../util/kconfig export obj ?= build export objutil ?= $(obj)/util export objk := $(objutil)/lp_kconfig - export KCONFIG_AUTOHEADER := $(obj)/config.h export KCONFIG_AUTOCONFIG := $(obj)/auto.conf +export KCONFIG_DEPENDENCIES := $(obj)/auto.conf.cmd +export KCONFIG_SPLITCONFIG := $(obj)/config +export KCONFIG_TRISTATE := $(obj)/tristate.conf +export KCONFIG_NEGATIVES := 1 +export Kconfig := Kconfig +export CONFIG_ := CONFIG_LP_ # directory containing the toplevel Makefile.inc TOPLEVEL := . @@ -87,7 +92,7 @@ all: real-all # This include must come _before_ the pattern rules below! # Order _does_ matter for pattern rules. -include util/kconfig/Makefile +include ../../util/kconfig/Makefile include $(HAVE_DOTCONFIG) @@ -276,7 +281,7 @@ printall: endif -$(shell mkdir -p $(obj) $(objk)/lxdialog $(additional-dirs) $(alldirs)) +$(shell mkdir -p $(KCONFIG_SPLITCONFIG) $(obj) $(objk)/lxdialog $(additional-dirs) $(alldirs)) cscope: cscope -bR |