From d3c5544bec154c469fbcb19b143f5131c5b417ea Mon Sep 17 00:00:00 2001
From: Aamir Bohra <aamir.bohra@intel.com>
Date: Sun, 16 Jun 2019 19:38:45 +0530
Subject: mb/google/hatch: Move memory strap GPIOs under variant gpio header

Move the memory strap gpios to variant/gpio.h, as the memory straps
are different for helios.

Change-Id: I1833c9539687011ee27fd3e88c0581e30ca59354
Signed-off-by: Aamir Bohra <aamir.bohra@intel.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/33541
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Furquan Shaikh <furquan@google.com>
---
 src/mainboard/google/hatch/romstage.c                              | 7 +------
 src/mainboard/google/hatch/variants/hatch/include/variant/gpio.h   | 6 ++++++
 .../google/hatch/variants/hatch_whl/include/variant/gpio.h         | 6 ++++++
 src/mainboard/google/hatch/variants/helios/include/variant/gpio.h  | 6 ++++++
 src/mainboard/google/hatch/variants/kindred/include/variant/gpio.h | 6 ++++++
 src/mainboard/google/hatch/variants/kohaku/include/variant/gpio.h  | 6 ++++++
 6 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/src/mainboard/google/hatch/romstage.c b/src/mainboard/google/hatch/romstage.c
index 2c630a8ce8..69fee28025 100644
--- a/src/mainboard/google/hatch/romstage.c
+++ b/src/mainboard/google/hatch/romstage.c
@@ -21,12 +21,7 @@
 #include <soc/cnl_memcfg_init.h>
 #include <soc/romstage.h>
 #include <string.h>
-
-/* Memory configuration board straps */
-#define GPIO_MEM_CONFIG_0	GPP_F20
-#define GPIO_MEM_CONFIG_1	GPP_F21
-#define GPIO_MEM_CONFIG_2	GPP_F11
-#define GPIO_MEM_CONFIG_3	GPP_F22
+#include <variant/gpio.h>
 
 /*
  * GPIO_MEM_CH_SEL is set to 1 for single channel skus
diff --git a/src/mainboard/google/hatch/variants/hatch/include/variant/gpio.h b/src/mainboard/google/hatch/variants/hatch/include/variant/gpio.h
index 5d69eeddbc..e7d8a75937 100644
--- a/src/mainboard/google/hatch/variants/hatch/include/variant/gpio.h
+++ b/src/mainboard/google/hatch/variants/hatch/include/variant/gpio.h
@@ -18,4 +18,10 @@
 
 #include <baseboard/gpio.h>
 
+/* Memory configuration board straps */
+#define GPIO_MEM_CONFIG_0	GPP_F20
+#define GPIO_MEM_CONFIG_1	GPP_F21
+#define GPIO_MEM_CONFIG_2	GPP_F11
+#define GPIO_MEM_CONFIG_3	GPP_F22
+
 #endif
diff --git a/src/mainboard/google/hatch/variants/hatch_whl/include/variant/gpio.h b/src/mainboard/google/hatch/variants/hatch_whl/include/variant/gpio.h
index d99e2bbd65..29e590422f 100644
--- a/src/mainboard/google/hatch/variants/hatch_whl/include/variant/gpio.h
+++ b/src/mainboard/google/hatch/variants/hatch_whl/include/variant/gpio.h
@@ -18,4 +18,10 @@
 
 #include <baseboard/gpio.h>
 
+/* Memory configuration board straps */
+#define GPIO_MEM_CONFIG_0	GPP_F20
+#define GPIO_MEM_CONFIG_1	GPP_F21
+#define GPIO_MEM_CONFIG_2	GPP_F11
+#define GPIO_MEM_CONFIG_3	GPP_F22
+
 #endif
diff --git a/src/mainboard/google/hatch/variants/helios/include/variant/gpio.h b/src/mainboard/google/hatch/variants/helios/include/variant/gpio.h
index d99e2bbd65..92f9d412fd 100644
--- a/src/mainboard/google/hatch/variants/helios/include/variant/gpio.h
+++ b/src/mainboard/google/hatch/variants/helios/include/variant/gpio.h
@@ -18,4 +18,10 @@
 
 #include <baseboard/gpio.h>
 
+/* Memory configuration board straps */
+#define GPIO_MEM_CONFIG_0	GPP_H19
+#define GPIO_MEM_CONFIG_1	GPP_H22
+#define GPIO_MEM_CONFIG_2	GPP_F10
+#define GPIO_MEM_CONFIG_3	GPP_F3
+
 #endif
diff --git a/src/mainboard/google/hatch/variants/kindred/include/variant/gpio.h b/src/mainboard/google/hatch/variants/kindred/include/variant/gpio.h
index d99e2bbd65..29e590422f 100644
--- a/src/mainboard/google/hatch/variants/kindred/include/variant/gpio.h
+++ b/src/mainboard/google/hatch/variants/kindred/include/variant/gpio.h
@@ -18,4 +18,10 @@
 
 #include <baseboard/gpio.h>
 
+/* Memory configuration board straps */
+#define GPIO_MEM_CONFIG_0	GPP_F20
+#define GPIO_MEM_CONFIG_1	GPP_F21
+#define GPIO_MEM_CONFIG_2	GPP_F11
+#define GPIO_MEM_CONFIG_3	GPP_F22
+
 #endif
diff --git a/src/mainboard/google/hatch/variants/kohaku/include/variant/gpio.h b/src/mainboard/google/hatch/variants/kohaku/include/variant/gpio.h
index d99e2bbd65..29e590422f 100644
--- a/src/mainboard/google/hatch/variants/kohaku/include/variant/gpio.h
+++ b/src/mainboard/google/hatch/variants/kohaku/include/variant/gpio.h
@@ -18,4 +18,10 @@
 
 #include <baseboard/gpio.h>
 
+/* Memory configuration board straps */
+#define GPIO_MEM_CONFIG_0	GPP_F20
+#define GPIO_MEM_CONFIG_1	GPP_F21
+#define GPIO_MEM_CONFIG_2	GPP_F11
+#define GPIO_MEM_CONFIG_3	GPP_F22
+
 #endif
-- 
cgit v1.2.3