Nico Huber (nico.h@gmx.de) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/17127
-gerrit
commit aa6e1d0ad2db2db599e2530b89740eface707410 Author: Nico Huber nico.h@gmx.de Date: Tue Oct 25 20:50:24 2016 +0200
Move LIBCONFIG_PATH handling where it doesn't hurt
Forcing LIBCONFIG_PATH to be set broke the option to use a prebuilt libpayload (i.e. by specifying LIBPAYLOAD_PREFIX).
Change-Id: I17cc9267b36eeef4cb8fda94471b006c3012eae3 Signed-off-by: Nico Huber nico.h@gmx.de --- Makefile | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/Makefile b/Makefile index 68338ba..4fb66fa 100644 --- a/Makefile +++ b/Makefile @@ -25,15 +25,6 @@ export srck := $(src)/util/kconfig export obj := $(src)/build export objk := $(src)/build/util/kconfig
-ifndef LIBCONFIG_PATH -LIBCONFIG_PATH := $(src)/../coreboot/payloads/libpayload -endif -export LIBCONFIG_PATH - -ifeq ($(wildcard $(LIBCONFIG_PATH)/*),) -$(error Could not find libpayload at $(LIBCONFIG_PATH)) -endif - export KERNELVERSION := $(PROGRAM_VERSION) export KCONFIG_AUTOHEADER := $(obj)/config.h export KCONFIG_AUTOCONFIG := $(obj)/auto.conf @@ -139,6 +130,15 @@ ifneq ($(strip $(HAVE_LIBPAYLOAD)),) libpayload: @printf "Found libpayload as $(LIBPAYLOAD)\n" else +ifndef LIBCONFIG_PATH +LIBCONFIG_PATH := $(src)/../coreboot/payloads/libpayload +endif +export LIBCONFIG_PATH + +ifeq ($(wildcard $(LIBCONFIG_PATH)/*),) +$(error Could not find libpayload at $(LIBCONFIG_PATH)) +endif + libpayload: $(LIBPAYLOAD) $(LIBPAYLOAD): $(src)/$(LIB_CONFIG) @printf "Building libpayload...\n"