From e44b407b00981f63aed24d48067a3010d169d1d2 Mon Sep 17 00:00:00 2001 From: Iru Cai Date: Fri, 15 Apr 2016 13:42:11 +0800 Subject: nvramcui: Update Makefile * use crossgcc to build nvramcui * build libpayload dependency Change-Id: Ife3054aeb03b4da0568ad47f96c633460d6c07ae Signed-off-by: Iru Cai Reviewed-on: https://review.coreboot.org/14377 Tested-by: build bot (Jenkins) Reviewed-by: Martin Roth --- payloads/nvramcui/Makefile | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) (limited to 'payloads') 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 -- cgit v1.2.3