summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Reinauer <stefan.reinauer@coreboot.org>2015-06-29 16:10:16 -0700
committerStefan Reinauer <stefan.reinauer@coreboot.org>2015-07-01 23:39:35 +0200
commit0ab2b25f01f7e2cbfcd632f8d78b969b79a534d8 (patch)
treeb62868cef601482a11c4c56bd2a5c225498b6bfa
parentca7794854c9d04d1fcd95c2e1170265b8a36297b (diff)
downloadcoreboot-0ab2b25f01f7e2cbfcd632f8d78b969b79a534d8.tar.xz
coreinfo: use coreboot's kconfig
Signed-off-by: Stefan Reinauer <stefan.reinauer@coreboot.org> Change-Id: I99e612dca3c2e5678d43b3e85eaf2f51d8f693e7 Reviewed-on: http://review.coreboot.org/10715 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi <pgeorgi@google.com>
-rw-r--r--payloads/coreinfo/Makefile15
1 files changed, 10 insertions, 5 deletions
diff --git a/payloads/coreinfo/Makefile b/payloads/coreinfo/Makefile
index a0e82d9456..68aeffc65e 100644
--- a/payloads/coreinfo/Makefile
+++ b/payloads/coreinfo/Makefile
@@ -20,13 +20,19 @@
src := $(shell pwd)
srctree := $(src)
-srck := $(src)/util/kconfig
+srck := $(src)/../../util/kconfig
obj := $(src)/build
objk := $(src)/build/util/kconfig
export KERNELVERSION := 0.1.0
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 V := $(V)
CONFIG_SHELL := sh
@@ -65,7 +71,7 @@ ifneq ($(strip $(HAVE_DOTCONFIG)),)
include $(src)/.config
all: $(TARGET)
-$(TARGET): $(src)/.config $(OBJS) prepare libpayload
+$(TARGET): $(src)/.config $(OBJS) libpayload
$(Q)printf " LPCC $(subst $(shell pwd)/,,$(@))\n"
$(Q)$(LPCC) -o $@ $(OBJS)
$(Q)$(OBJCOPY) --only-keep-debug $@ $(TARGET).debug
@@ -95,8 +101,7 @@ libpayload:
$(Q)make -C $(LIBCONFIG_PATH) DESTDIR=$(shell pwd)/$(LIBPAYLOAD_DIR) install
endif
-prepare:
- $(Q)mkdir -p $(obj)/util/kconfig/lxdialog
+$(shell mkdir -p $(obj) $(objk)/lxdialog $(KCONFIG_SPLITCONFIG))
clean:
$(Q)rm -rf build/*.elf build/*.o
@@ -105,6 +110,6 @@ distclean: clean
$(Q)rm -rf build
$(Q)rm -f .config .config.old ..config.tmp .kconfig.d .tmpconfig*
-include util/kconfig/Makefile
+include $(srck)/Makefile
.PHONY: $(PHONY) prepare clean distclean