From 3ee43171ef4b2f5a3513fc785802a02afb4af4a9 Mon Sep 17 00:00:00 2001 From: Patrick Georgi Date: Fri, 9 May 2014 20:41:01 +0200 Subject: [PATCH] payloads: make build system integration work again Payloads using Kconfig get confused by coreboot Kconfig configuration in environment variables. Prune them. Change-Id: I63da2af0a15dca35d70cd65b2f74a1564aab9483 Signed-off-by: Patrick Georgi Reviewed-on: http://review.coreboot.org/5710 Reviewed-by: Edward O'Callaghan Tested-by: build bot (Jenkins) Reviewed-by: Idwer Vollering --- payloads/external/FILO/Makefile.inc | 5 +++++ payloads/external/SeaBIOS/Makefile.inc | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/payloads/external/FILO/Makefile.inc b/payloads/external/FILO/Makefile.inc index 72f86bc35a..d298d1dab3 100644 --- a/payloads/external/FILO/Makefile.inc +++ b/payloads/external/FILO/Makefile.inc @@ -3,7 +3,12 @@ NAME-$(CONFIG_FILO_MASTER)=MASTER TAG-$(CONFIG_FILO_STABLE)=4dbb31a64fe5b1c7e3025ab34619220609897646 NAME-$(CONFIG_FILO_STABLE)=STABLE +unexport KCONFIG_AUTOHEADER unexport KCONFIG_AUTOCONFIG +unexport KCONFIG_DEPENDENCIES +unexport KCONFIG_SPLITCONFIG +unexport KCONFIG_TRISTATE +unexport KCONFIG_NEGATIVES all: filo diff --git a/payloads/external/SeaBIOS/Makefile.inc b/payloads/external/SeaBIOS/Makefile.inc index 153cf97322..042df0a73e 100644 --- a/payloads/external/SeaBIOS/Makefile.inc +++ b/payloads/external/SeaBIOS/Makefile.inc @@ -1,7 +1,12 @@ TAG-$(CONFIG_SEABIOS_MASTER)=origin/master TAG-$(CONFIG_SEABIOS_STABLE)=88cb66ea542906ffff8a80ef397b9e3adbb33116 +unexport KCONFIG_AUTOHEADER unexport KCONFIG_AUTOCONFIG +unexport KCONFIG_DEPENDENCIES +unexport KCONFIG_SPLITCONFIG +unexport KCONFIG_TRISTATE +unexport KCONFIG_NEGATIVES all: build