From 2bcbd0bfe0788d1447a5a66bca39bb4bf4b059fe Mon Sep 17 00:00:00 2001
From: Trammell hudson <hudson@trmm.net>
Date: Mon, 13 Aug 2018 10:26:08 -0400
Subject: [PATCH] Use defconfig for coreboot builds

---
 modules/coreboot | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/modules/coreboot b/modules/coreboot
index d785abbc..bdab82ee 100644
--- a/modules/coreboot
+++ b/modules/coreboot
@@ -19,18 +19,18 @@ $(build)/$(coreboot_dir)/.configured: $(CONFIG_COREBOOT_CONFIG)
 EXTRA_FLAGS := -fdebug-prefix-map=$(pwd)=heads -gno-record-gcc-switches
 
 coreboot_configure := \
-	$(MAKE) -C $(build)/$(coreboot_base_dir) \
-		oldconfig \
-		obj=$(build)/$(coreboot_dir) \
-		DOTCONFIG=../../$(CONFIG_COREBOOT_CONFIG) \
+	mkdir -p "$(build)/$(coreboot_dir)" \
+	&& cp "$(pwd)/$(CONFIG_COREBOOT_CONFIG)" "$(build)/$(coreboot_dir)/.config" \
+	&& $(MAKE) olddefconfig \
+		-C "$(build)/$(coreboot_base_dir)" \
+		obj="$(build)/$(coreboot_dir)" \
 		BUILD_TIMELESS=1 \
 		CFLAGS_x86_32="$(EXTRA_FLAGS)" \
 		CFLAGS_x86_64="$(EXTRA_FLAGS)" \
 
 coreboot_target := \
-	-C $(build)/$(coreboot_base_dir) \
-	obj=$(build)/$(coreboot_dir) \
-	DOTCONFIG=../../$(CONFIG_COREBOOT_CONFIG) \
+	-C "$(build)/$(coreboot_base_dir)" \
+	obj="$(build)/$(coreboot_dir)" \
 	BUILD_TIMELESS=1 \
 	CFLAGS_x86_32="$(EXTRA_FLAGS)" \
 	CFLAGS_x86_64="$(EXTRA_FLAGS)" \
@@ -64,9 +64,18 @@ $(build)/$(BOARD)/coreboot.rom: $(build)/$(coreboot_dir)/.build
 coreboot.menuconfig:
 	$(MAKE) \
 		-C "$(build)/$(coreboot_base_dir)" \
-		DOTCONFIG="../../$(CONFIG_COREBOOT_CONFIG)" \
+		DOTCONFIG="$(build)/$(coreboot_dir)/.config" \
 		menuconfig
 
+# The config file in the repo is stored as a "defconfig" format
+# which only includes the options that have changed from the defaults.
+coreboot.saveconfig:
+	$(MAKE) \
+		-C "$(build)/$(coreboot_base_dir)" \
+		DOTCONFIG="$(build)/$(coreboot_dir)/.config" \
+		DEFCONFIG="$(pwd)/$(CONFIG_COREBOOT_CONFIG)" \
+		savedefconfig
+
 
 # if we are not building from a git checkout,
 # we must also download the coreboot-blobs tree