summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIru Cai <mytbk920423@gmail.com>2016-04-15 13:42:11 +0800
committerMartin Roth <martinroth@google.com>2016-04-20 18:41:37 +0200
commite44b407b00981f63aed24d48067a3010d169d1d2 (patch)
treec1c78efdc513c6f4e3f669c844674d8f407dc255
parentae2963587603c205dfada1a7cf5b5859390ac27e (diff)
nvramcui: Update Makefile
* use crossgcc to build nvramcui * build libpayload dependency Change-Id: Ife3054aeb03b4da0568ad47f96c633460d6c07ae Signed-off-by: Iru Cai <mytbk920423@gmail.com> Reviewed-on: https://review.coreboot.org/14377 Tested-by: build bot (Jenkins) Reviewed-by: Martin Roth <martinroth@google.com>
-rwxr-xr-xpayloads/nvramcui/Makefile24
1 files changed, 22 insertions, 2 deletions
diff --git a/payloads/nvramcui/Makefile b/payloads/nvramcui/Makefile
index 10dc362ed5..0f27ff88ed 100755
--- a/payloads/nvramcui/Makefile
+++ b/payloads/nvramcui/Makefile
@@ -1,12 +1,32 @@
-LPGCC = ../libpayload/install/libpayload/bin/lpgcc
+LIBPAYLOAD_DIR=$(CURDIR)/libpayload
+XCOMPILE=$(LIBPAYLOAD_DIR)/libpayload.xcompile
+# build libpayload and put .config file in $(CURDIR) instead of ../libpayload
+# to avoid pollute the libpayload source directory and possible conflicts
+LPOPTS=obj="$(CURDIR)/build" DESTDIR="$(CURDIR)" DOTCONFIG="$(CURDIR)/.config"
all: nvramcui.elf
-%.elf:
+libpayload:
+ $(MAKE) -C ../libpayload $(LPOPTS) defconfig
+ $(MAKE) -C ../libpayload $(LPOPTS)
+ $(MAKE) -C ../libpayload $(LPOPTS) install
+
+ifneq ($(strip $(wildcard libpayload)),)
+include $(XCOMPILE)
+LPGCC = CC="$(GCC_CC_x86_32)" "$(LIBPAYLOAD_DIR)/bin/lpgcc"
+%.elf: %.c
$(LPGCC) -o $*.elf $*.c
+else
+# If libpayload is not found, first build libpayload,
+# then do the make, this time it'll find libpayload
+# and generate the nvramcui.elf target
+%.elf: libpayload
+ $(MAKE) all
+endif
.PHONY:
clean:
rm -f nvramcui.elf
distclean: clean
+ rm -rf build libpayload .config