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>

19 files changed, 21 insertions, 85 deletions

diff --git a/src/mainboard/asrock/g41c-gs/Kconfig b/src/mainboard/asrock/g41c-gs/Kconfig
index c0a63be10f..e7cbf7aeb1 100644
--- a/src/mainboard/asrock/g41c-gs/Kconfig
+++ b/src/mainboard/asrock/g41c-gs/Kconfig
@@ -62,11 +62,7 @@ config MAINBOARD_PART_NUMBER
 
 config DEVICETREE
 	string
-	default "variants/g41c-gs-r2/devicetree.cb" if BOARD_ASROCK_G41C_GS_R2_0
-	default "variants/g41c-gs/devicetree.cb" if BOARD_ASROCK_G41C_GS
-	default "variants/g41m-gs/devicetree.cb" if BOARD_ASROCK_G41M_GS
-	default "variants/g41m-s3/devicetree.cb" if BOARD_ASROCK_G41M_S3
-	default "variants/g41m-vs3-r2/devicetree.cb" if BOARD_ASROCK_G41M_VS3_R2_0
+	default "variants/$(CONFIG_VARIANT_DIR)/devicetree.cb"
 
 config MAX_CPUS
 	int
diff --git a/src/mainboard/asus/p5qc/Kconfig b/src/mainboard/asus/p5qc/Kconfig
index 75c7c7c80e..c3b287c301 100644
--- a/src/mainboard/asus/p5qc/Kconfig
+++ b/src/mainboard/asus/p5qc/Kconfig
@@ -46,8 +46,7 @@ config MAINBOARD_PART_NUMBER
 
 config DEVICETREE
 	string
-	default "variants/p5qc/devicetree.cb" if BOARD_ASUS_P5QC
-	default "variants/p5q_pro/devicetree.cb" if BOARD_ASUS_P5Q_PRO
+	default "variants/$(CONFIG_VARIANT_DIR)/devicetree.cb"
 
 config MAX_CPUS
 	int
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
diff --git a/src/mainboard/lenovo/t520/Kconfig b/src/mainboard/lenovo/t520/Kconfig
index 79455e2dda..6bc5884d4f 100644
--- a/src/mainboard/lenovo/t520/Kconfig
+++ b/src/mainboard/lenovo/t520/Kconfig
@@ -37,8 +37,7 @@ config MAINBOARD_DIR
 
 config DEVICETREE
 	string
-	default "variants/t520/devicetree.cb" if BOARD_LENOVO_T520
-	default "variants/w520/devicetree.cb" if BOARD_LENOVO_W520
+	default "variants/$(CONFIG_VARIANT_DIR)/devicetree.cb"
 
 config MAINBOARD_PART_NUMBER
 	string
diff --git a/src/mainboard/lenovo/t530/Kconfig b/src/mainboard/lenovo/t530/Kconfig
index d107504b61..61752d86bb 100644
--- a/src/mainboard/lenovo/t530/Kconfig
+++ b/src/mainboard/lenovo/t530/Kconfig
@@ -39,8 +39,7 @@ config MAINBOARD_DIR
 
 config DEVICETREE
 	string
-	default "variants/t530/devicetree.cb" if BOARD_LENOVO_T530
-	default "variants/w530/devicetree.cb" if BOARD_LENOVO_W530
+	default "variants/$(CONFIG_VARIANT_DIR)/devicetree.cb"
 
 config MAINBOARD_PART_NUMBER
 	string
diff --git a/src/mainboard/opencellular/rotundu/Kconfig b/src/mainboard/opencellular/rotundu/Kconfig
index 34916c3815..f5d9340114 100644
--- a/src/mainboard/opencellular/rotundu/Kconfig
+++ b/src/mainboard/opencellular/rotundu/Kconfig
@@ -59,8 +59,7 @@ config MAINBOARD_PART_NUMBER
 
 config DEVICETREE
 	string
-	default "variants/rotundu/devicetree.cb" if BOARD_OPENCELLULAR_ROTUNDU
-	default "variants/supabrckv1/devicetree.cb" if BOARD_OPENCELLULAR_SUPABRCKV1
+	default "variants/$(CONFIG_VARIANT_DIR)/devicetree.cb"
 
 config MAINBOARD_DIR
 	string
diff --git a/src/mainboard/purism/librem_bdw/Kconfig b/src/mainboard/purism/librem_bdw/Kconfig
index fd78087b2d..f9016b913e 100644
--- a/src/mainboard/purism/librem_bdw/Kconfig
+++ b/src/mainboard/purism/librem_bdw/Kconfig
@@ -17,8 +17,7 @@ config VARIANT_DIR
 
 config DEVICETREE
 	string
-	default "variants/librem13v1/devicetree.cb" if BOARD_PURISM_LIBREM13_V1
-	default "variants/librem15v2/devicetree.cb" if BOARD_PURISM_LIBREM15_V2
+	default "variants/$(CONFIG_VARIANT_DIR)/devicetree.cb"
 
 config DRIVERS_PS2_KEYBOARD
 	def_bool y
diff --git a/src/mainboard/purism/librem_skl/Kconfig b/src/mainboard/purism/librem_skl/Kconfig
index be4b7a37c7..d757d1aeed 100644
--- a/src/mainboard/purism/librem_skl/Kconfig
+++ b/src/mainboard/purism/librem_skl/Kconfig
@@ -47,8 +47,7 @@ config MAINBOARD_DIR
 
 config DEVICETREE
 	string
-	default "variants/librem13v2/devicetree.cb" if BOARD_PURISM_LIBREM13_V2
-	default "variants/librem15v3/devicetree.cb" if BOARD_PURISM_LIBREM15_V3
+	default "variants/$(CONFIG_VARIANT_DIR)/devicetree.cb"
 
 config MAX_CPUS
 	int
diff --git a/src/mainboard/roda/rv11/Kconfig b/src/mainboard/roda/rv11/Kconfig
index 9e81841b86..de7a0dc89c 100644
--- a/src/mainboard/roda/rv11/Kconfig
+++ b/src/mainboard/roda/rv11/Kconfig
@@ -27,8 +27,7 @@ config VARIANT_DIR
 
 config DEVICETREE
 	string
-	default "variants/rv11/devicetree.cb" if BOARD_RODA_RV11
-	default "variants/rw11/devicetree.cb" if BOARD_RODA_RW11
+	default "variants/$(CONFIG_VARIANT_DIR)/devicetree.cb"
 
 config MAINBOARD_PART_NUMBER
 	string
diff --git a/src/mainboard/siemens/mc_apl1/Kconfig b/src/mainboard/siemens/mc_apl1/Kconfig
index eeb5d9b547..19bd75a59c 100644
--- a/src/mainboard/siemens/mc_apl1/Kconfig
+++ b/src/mainboard/siemens/mc_apl1/Kconfig
@@ -21,6 +21,10 @@ config VARIANT_DIR
 	default "mc_apl3" if BOARD_SIEMENS_MC_APL3
 	default "mc_apl4" if BOARD_SIEMENS_MC_APL4
 
+config DEVICETREE
+	string
+	default "variants/$(CONFIG_VARIANT_DIR)/devicetree.cb"
+
 config MAINBOARD_PART_NUMBER
 	string
 	default "MC APL1" if BOARD_SIEMENS_MC_APL1
diff --git a/src/mainboard/siemens/mc_apl1/variants/mc_apl1/Kconfig b/src/mainboard/siemens/mc_apl1/variants/mc_apl1/Kconfig
index 1ed260945b..14b4aa9dc6 100644
--- a/src/mainboard/siemens/mc_apl1/variants/mc_apl1/Kconfig
+++ b/src/mainboard/siemens/mc_apl1/variants/mc_apl1/Kconfig
@@ -9,8 +9,4 @@ config BOARD_SIEMENS_MC_APL1_VAR
 	select NC_FPGA_NOTIFY_CB_READY
 	select APL_SKIP_SET_POWER_LIMITS
 
-config DEVICETREE
-	string
-	default "variants/mc_apl1/devicetree.cb"
-
 endif # BOARD_SIEMENS_MC_APL1
diff --git a/src/mainboard/siemens/mc_apl1/variants/mc_apl2/Kconfig b/src/mainboard/siemens/mc_apl1/variants/mc_apl2/Kconfig
index aa90041793..4fc473d65b 100644
--- a/src/mainboard/siemens/mc_apl1/variants/mc_apl2/Kconfig
+++ b/src/mainboard/siemens/mc_apl1/variants/mc_apl2/Kconfig
@@ -7,8 +7,4 @@ config BOARD_SIEMENS_MC_APL2_VAR
 	select DRIVERS_I2C_RX6110SA
 	select DRIVER_SIEMENS_NC_FPGA
 
-config DEVICETREE
-	string
-	default "variants/mc_apl2/devicetree.cb"
-
 endif # BOARD_SIEMENS_MC_APL2
diff --git a/src/mainboard/siemens/mc_apl1/variants/mc_apl3/Kconfig b/src/mainboard/siemens/mc_apl1/variants/mc_apl3/Kconfig
index 3c5a9fabfc..f329428ee8 100644
--- a/src/mainboard/siemens/mc_apl1/variants/mc_apl3/Kconfig
+++ b/src/mainboard/siemens/mc_apl1/variants/mc_apl3/Kconfig
@@ -9,8 +9,4 @@ config BOARD_SIEMENS_MC_APL3_VAR
 	select NC_FPGA_NOTIFY_CB_READY
 	select APL_SKIP_SET_POWER_LIMITS
 
-config DEVICETREE
-	string
-	default "variants/mc_apl3/devicetree.cb"
-
 endif # BOARD_SIEMENS_MC_APL3
diff --git a/src/mainboard/siemens/mc_apl1/variants/mc_apl4/Kconfig b/src/mainboard/siemens/mc_apl1/variants/mc_apl4/Kconfig
index ea81c6ce13..0a82f080a6 100644
--- a/src/mainboard/siemens/mc_apl1/variants/mc_apl4/Kconfig
+++ b/src/mainboard/siemens/mc_apl1/variants/mc_apl4/Kconfig
@@ -5,8 +5,4 @@ config BOARD_SIEMENS_MC_APL4_VAR
 	def_bool y
 	select DRIVER_INTEL_I210
 
-config DEVICETREE
-	string
-	default "variants/mc_apl4/devicetree.cb"
-
 endif # BOARD_SIEMENS_MC_APL4