[coreboot-gerrit] Patch set updated for coreboot: Kconfig: Change use of CONFIG_MAINBOARD_DIR to MAINBOARDDIR

[Martin Roth (martinroth@google.com)]

Martin Roth (martinroth at google.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/16131

-gerrit

commit d5b06b29f70e6f56e5346d606d74b6e884884298
Author: Martin Roth <martinroth at google.com>
Date:   Tue Aug 9 12:38:06 2016 -0600

    Kconfig: Change use of CONFIG_MAINBOARD_DIR to MAINBOARDDIR
    
    In the makefile, CONFIG_MAINBOARD_DIR gets the quotes stripped to become
    MAINBOARDDIR.  In all these cases, we want to use the version with the
    quotes stripped, so use that version of the variable.
    
    Change-Id: I70a6e4bb753053cbe1580cbc599dc80a01c5489c
    Signed-off-by: Martin Roth <martinroth at google.com>
---
 src/Kconfig                      | 2 +-
 src/soc/intel/apollolake/Kconfig | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Kconfig b/src/Kconfig
index 3cb012e..08b6adb 100644
--- a/src/Kconfig
+++ b/src/Kconfig
@@ -402,7 +402,7 @@ config CBFS_SIZE
 
 config FMDFILE
 	string "fmap description file in fmd format"
-	default "src/mainboard/$(CONFIG_MAINBOARD_DIR)/chromeos.fmd" if CHROMEOS
+	default "src/mainboard/$(MAINBOARDDIR)/chromeos.fmd" if CHROMEOS
 	default ""
 	help
 	  The build system creates a default FMAP from ROM_SIZE and CBFS_SIZE,
diff --git a/src/soc/intel/apollolake/Kconfig b/src/soc/intel/apollolake/Kconfig
index 0745679..7dae68d 100644
--- a/src/soc/intel/apollolake/Kconfig
+++ b/src/soc/intel/apollolake/Kconfig
@@ -179,7 +179,7 @@ config LBP2_FMAP_NAME
 config LBP2_FILE_NAME
 	string "Path of file to write to logical boot partition 2 region"
 	depends on NEED_LBP2
-	default "3rdparty/blobs/mainboard/$(CONFIG_MAINBOARD_DIR)/lbp2.bin"
+	default "3rdparty/blobs/mainboard/$(MAINBOARDDIR)/lbp2.bin"
 	help
 	  Name of file to store in the logical boot partition 2 region.
 
@@ -200,7 +200,7 @@ config IFWI_FMAP_NAME
 config IFWI_FILE_NAME
 	string "Path of file to write to IFWI region"
 	depends on NEED_IFWI
-	default "3rdparty/blobs/mainboard/$(CONFIG_MAINBOARD_DIR)/ifwi.bin"
+	default "3rdparty/blobs/mainboard/$(MAINBOARD_DIR)/ifwi.bin"
 	help
 	  Name of file to store in the IFWI region.