mb/*/*/Kconfig: Use CONFIG_VARIANT_DIR for devicetree

Change-Id: Ic9620cfa1630c7c085b6c244ca80dc023a181e30
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
Reviewed-on: https://review.coreboot.org/29595
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Elyes HAOUAS <ehaouas@noos.fr>
Reviewed-by: Werner Zeh <werner.zeh@siemens.com>

6 files changed, 9 insertions, 50 deletions

diff --git a/src/mainboard/google/auron/Kconfig b/src/mainboard/google/auron/Kconfig
index 095f18120c..b92869b0f0 100644
--- a/src/mainboard/google/auron/Kconfig
+++ b/src/mainboard/google/auron/Kconfig
@@ -58,12 +58,7 @@ config GBB_HWID
 
 config DEVICETREE
 	string
-	default "variants/auron_paine/devicetree.cb" if BOARD_GOOGLE_AURON_PAINE
-	default "variants/auron_yuna/devicetree.cb" if BOARD_GOOGLE_AURON_YUNA
-	default "variants/buddy/devicetree.cb" if BOARD_GOOGLE_BUDDY
-	default "variants/gandof/devicetree.cb" if BOARD_GOOGLE_GANDOF
-	default "variants/lulu/devicetree.cb" if BOARD_GOOGLE_LULU
-	default "variants/samus/devicetree.cb" if BOARD_GOOGLE_SAMUS
+	default "variants/$(CONFIG_VARIANT_DIR)/devicetree.cb"
 
 config EC_GOOGLE_CHROMEEC_BOARDNAME
 	string
diff --git a/src/mainboard/google/cyan/Kconfig b/src/mainboard/google/cyan/Kconfig
index 75204104f1..e7a9d1fa57 100644
--- a/src/mainboard/google/cyan/Kconfig
+++ b/src/mainboard/google/cyan/Kconfig
@@ -77,18 +77,7 @@ config MAINBOARD_VENDOR
 
 config DEVICETREE
 	string
-	default "variants/banon/devicetree.cb" if BOARD_GOOGLE_BANON
-	default "variants/celes/devicetree.cb" if BOARD_GOOGLE_CELES
-	default "variants/cyan/devicetree.cb" if BOARD_GOOGLE_CYAN
-	default "variants/edgar/devicetree.cb" if BOARD_GOOGLE_EDGAR
-	default "variants/kefka/devicetree.cb" if BOARD_GOOGLE_KEFKA
-	default "variants/reks/devicetree.cb" if BOARD_GOOGLE_REKS
-	default "variants/relm/devicetree.cb" if BOARD_GOOGLE_RELM
-	default "variants/setzer/devicetree.cb" if BOARD_GOOGLE_SETZER
-	default "variants/terra/devicetree.cb" if BOARD_GOOGLE_TERRA
-	default "variants/ultima/devicetree.cb" if BOARD_GOOGLE_ULTIMA
-	default "variants/wizpig/devicetree.cb" if BOARD_GOOGLE_WIZPIG
-
+	default "variants/${CONFIG_VARIANT_DIR}/devicetree.cb"
 
 config VGA_BIOS_FILE
 	string
diff --git a/src/mainboard/google/glados/Kconfig b/src/mainboard/google/glados/Kconfig
index 05d7d4a7e1..c5a80d4ae1 100644
--- a/src/mainboard/google/glados/Kconfig
+++ b/src/mainboard/google/glados/Kconfig
@@ -60,13 +60,7 @@ config VARIANT_DIR
 
 config DEVICETREE
 	string
-	default "variants/asuka/devicetree.cb" if BOARD_GOOGLE_ASUKA
-	default "variants/caroline/devicetree.cb" if BOARD_GOOGLE_CAROLINE
-	default "variants/cave/devicetree.cb" if BOARD_GOOGLE_CAVE
-	default "variants/chell/devicetree.cb" if BOARD_GOOGLE_CHELL
-	default "variants/glados/devicetree.cb" if BOARD_GOOGLE_GLADOS
-	default "variants/lars/devicetree.cb" if BOARD_GOOGLE_LARS
-	default "variants/sentry/devicetree.cb" if BOARD_GOOGLE_SENTRY
+	default "variants/${CONFIG_VARIANT_DIR}/devicetree.cb"
 
 config MAX_CPUS
 	int
diff --git a/src/mainboard/google/rambi/Kconfig b/src/mainboard/google/rambi/Kconfig
index 725d69dfe2..6d0c0dfce0 100644
--- a/src/mainboard/google/rambi/Kconfig
+++ b/src/mainboard/google/rambi/Kconfig
@@ -84,22 +84,7 @@ config GBB_HWID
 
 config DEVICETREE
 	string
-	default "variants/banjo/devicetree.cb" if BOARD_GOOGLE_BANJO
-	default "variants/candy/devicetree.cb" if BOARD_GOOGLE_CANDY
-	default "variants/clapper/devicetree.cb" if BOARD_GOOGLE_CLAPPER
-	default "variants/enguarde/devicetree.cb" if BOARD_GOOGLE_ENGUARDE
-	default "variants/glimmer/devicetree.cb" if BOARD_GOOGLE_GLIMMER
-	default "variants/gnawty/devicetree.cb" if BOARD_GOOGLE_GNAWTY
-	default "variants/heli/devicetree.cb" if BOARD_GOOGLE_HELI
-	default "variants/kip/devicetree.cb" if BOARD_GOOGLE_KIP
-	default "variants/ninja/devicetree.cb" if BOARD_GOOGLE_NINJA
-	default "variants/orco/devicetree.cb" if BOARD_GOOGLE_ORCO
-	default "variants/quawks/devicetree.cb" if BOARD_GOOGLE_QUAWKS
-	default "variants/rambi/devicetree.cb" if BOARD_GOOGLE_RAMBI
-	default "variants/squawks/devicetree.cb" if BOARD_GOOGLE_SQUAWKS
-	default "variants/sumo/devicetree.cb" if BOARD_GOOGLE_SUMO
-	default "variants/swanky/devicetree.cb" if BOARD_GOOGLE_SWANKY
-	default "variants/winky/devicetree.cb" if BOARD_GOOGLE_WINKY
+	default "variants/$(CONFIG_VARIANT_DIR)/devicetree.cb"
 
 config EC_GOOGLE_CHROMEEC_BOARDNAME
 	string
diff --git a/src/mainboard/google/sarien/Kconfig b/src/mainboard/google/sarien/Kconfig
index 7494edd4a1..bd674769c9 100644
--- a/src/mainboard/google/sarien/Kconfig
+++ b/src/mainboard/google/sarien/Kconfig
@@ -31,11 +31,6 @@ config CHROMEOS
 	select GBB_FLAG_FORCE_DEV_BOOT_LEGACY
 	select GBB_FLAG_FORCE_MANUAL_RECOVERY
 
-config DEVICETREE
-	string
-	default "variants/arcada/devicetree.cb" if BOARD_GOOGLE_ARCADA
-	default "variants/sarien/devicetree.cb" if BOARD_GOOGLE_SARIEN
-
 config DIMM_MAX
 	int
 	default 2
@@ -89,6 +84,10 @@ config VARIANT_DIR
 	default "arcada" if BOARD_GOOGLE_ARCADA
 	default "sarien" if BOARD_GOOGLE_SARIEN
 
+config DEVICETREE
+	string
+	default "variants/${CONFIG_VARIANT_DIR}/devicetree.cb"
+
 config VBOOT
 	select HAS_RECOVERY_MRC_CACHE
 	select MRC_CLEAR_NORMAL_CACHE_ON_RECOVERY_RETRAIN
diff --git a/src/mainboard/google/slippy/Kconfig b/src/mainboard/google/slippy/Kconfig
index 6891c0b7f4..738735e8f5 100644
--- a/src/mainboard/google/slippy/Kconfig
+++ b/src/mainboard/google/slippy/Kconfig
@@ -56,10 +56,7 @@ config GBB_HWID
 
 config DEVICETREE
 	string
-	default "variants/falco/devicetree.cb" if BOARD_GOOGLE_FALCO
-	default "variants/leon/devicetree.cb" if BOARD_GOOGLE_LEON
-	default "variants/peppy/devicetree.cb" if BOARD_GOOGLE_PEPPY
-	default "variants/wolf/devicetree.cb" if BOARD_GOOGLE_WOLF
+	default "variants/$(CONFIG_VARIANT_DIR)/devicetree.cb"
 
 config MMCONF_BASE_ADDRESS
 	hex