Change in coreboot[master]: mb/*/*/Kconfig: Use CONFIG_VARIANT_DIR for devicetree

[Peter Lemenkov (Code Review)]

Peter Lemenkov has uploaded this change for review. ( https://review.coreboot.org/29595

Change subject: mb/*/*/Kconfig: Use CONFIG_VARIANT_DIR for devicetree
......................................................................

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

Change-Id: Ic9620cfa1630c7c085b6c244ca80dc023a181e30
Signed-off-by: Peter Lemenkov 
---
M src/mainboard/asrock/g41c-gs/Kconfig
M src/mainboard/asus/p5qc/Kconfig
M src/mainboard/lenovo/t520/Kconfig
M src/mainboard/lenovo/t530/Kconfig
M src/mainboard/opencellular/rotundu/Kconfig
M src/mainboard/purism/librem_bdw/Kconfig
M src/mainboard/purism/librem_skl/Kconfig
M src/mainboard/roda/rv11/Kconfig
8 files changed, 8 insertions(+), 19 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/95/29595/1

diff --git a/src/mainboard/asrock/g41c-gs/Kconfig b/src/mainboard/asrock/g41c-gs/Kconfig
index c0a63be..e7cbf7a 100644
--- a/src/mainboard/asrock/g41c-gs/Kconfig
+++ b/src/mainboard/asrock/g41c-gs/Kconfig
@@ -62,11 +62,7 @@

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 75c7c7c..c3b287c 100644
--- a/src/mainboard/asus/p5qc/Kconfig
+++ b/src/mainboard/asus/p5qc/Kconfig
@@ -46,8 +46,7 @@

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/lenovo/t520/Kconfig b/src/mainboard/lenovo/t520/Kconfig
index 79455e2..6bc5884 100644
--- a/src/mainboard/lenovo/t520/Kconfig
+++ b/src/mainboard/lenovo/t520/Kconfig
@@ -37,8 +37,7 @@

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 d107504..61752d8 100644
--- a/src/mainboard/lenovo/t530/Kconfig
+++ b/src/mainboard/lenovo/t530/Kconfig
@@ -39,8 +39,7 @@

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 edacf0d..b1fb040 100644
--- a/src/mainboard/opencellular/rotundu/Kconfig
+++ b/src/mainboard/opencellular/rotundu/Kconfig
@@ -59,8 +59,7 @@

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 fd78087..f9016b9 100644
--- a/src/mainboard/purism/librem_bdw/Kconfig
+++ b/src/mainboard/purism/librem_bdw/Kconfig
@@ -17,8 +17,7 @@

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 be4b7a3..d757d1a 100644
--- a/src/mainboard/purism/librem_skl/Kconfig
+++ b/src/mainboard/purism/librem_skl/Kconfig
@@ -47,8 +47,7 @@

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 9e81841..de7a0dc 100644
--- a/src/mainboard/roda/rv11/Kconfig
+++ b/src/mainboard/roda/rv11/Kconfig
@@ -27,8 +27,7 @@

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