summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrankChu <frank_chu@pegatron.corp-partner.google.com>2021-03-10 10:01:22 +0800
committerPatrick Georgi <pgeorgi@google.com>2021-03-15 06:18:27 +0000
commitf8b2d32ad9b6fca6c2a598697ae271ce5f86db49 (patch)
treef2539772d24ded4d426895ceb7ca4a3bc36adedc
parent8dffc38f6e8ff4d1f7e26b261bfd6d7fda6be173 (diff)
mb/google/volteer: Create collis variant
Create the collis variant of the volteer reference board by copying the template files to a new directory named for the variant. (Auto-Generated by create_coreboot_variant.sh version 4.5.0). BUG=b:182227204 BRANCH=None TEST=util/abuild/abuild -p none -t google/volteer -x -a make sure the build includes GOOGLE_COLLIS Signed-off-by: FrankChu <frank_chu@pegatron.corp-partner.google.com> Change-Id: Ibcf8b59b38d02517cea0a3ee474ff82fc0a2a958 Reviewed-on: https://review.coreboot.org/c/coreboot/+/51387 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Zhuohao Lee <zhuohao@google.com> Reviewed-by: Paul Fagerburg <pfagerburg@chromium.org>
-rw-r--r--src/mainboard/google/volteer/Kconfig2
-rw-r--r--src/mainboard/google/volteer/Kconfig.name4
-rw-r--r--src/mainboard/google/volteer/variants/collis/include/variant/ec.h8
-rw-r--r--src/mainboard/google/volteer/variants/collis/include/variant/gpio.h15
-rw-r--r--src/mainboard/google/volteer/variants/collis/memory/Makefile.inc5
-rw-r--r--src/mainboard/google/volteer/variants/collis/memory/dram_id.generated.txt1
-rw-r--r--src/mainboard/google/volteer/variants/collis/memory/mem_parts_used.txt11
-rw-r--r--src/mainboard/google/volteer/variants/collis/overridetree.cb6
8 files changed, 52 insertions, 0 deletions
diff --git a/src/mainboard/google/volteer/Kconfig b/src/mainboard/google/volteer/Kconfig
index f3724d886d..47f93cc77c 100644
--- a/src/mainboard/google/volteer/Kconfig
+++ b/src/mainboard/google/volteer/Kconfig
@@ -107,6 +107,7 @@ config MAINBOARD_PART_NUMBER
default "Voema" if BOARD_GOOGLE_VOEMA
default "Drobit" if BOARD_GOOGLE_DROBIT
default "Copano" if BOARD_GOOGLE_COPANO
+ default "Collis" if BOARD_GOOGLE_COLLIS
config MAX_CPUS
int
@@ -151,6 +152,7 @@ config VARIANT_DIR
default "voema" if BOARD_GOOGLE_VOEMA
default "drobit" if BOARD_GOOGLE_DROBIT
default "copano" if BOARD_GOOGLE_COPANO
+ default "collis" if BOARD_GOOGLE_COLLIS
config VARIANT_HAS_MIPI_CAMERA
bool
diff --git a/src/mainboard/google/volteer/Kconfig.name b/src/mainboard/google/volteer/Kconfig.name
index 5bb1794cbf..4702832ff9 100644
--- a/src/mainboard/google/volteer/Kconfig.name
+++ b/src/mainboard/google/volteer/Kconfig.name
@@ -82,3 +82,7 @@ config BOARD_GOOGLE_DROBIT
config BOARD_GOOGLE_COPANO
bool "-> Copano"
select BOARD_GOOGLE_BASEBOARD_VOLTEER
+
+config BOARD_GOOGLE_COLLIS
+ bool "-> Collis"
+ select BOARD_GOOGLE_BASEBOARD_VOLTEER
diff --git a/src/mainboard/google/volteer/variants/collis/include/variant/ec.h b/src/mainboard/google/volteer/variants/collis/include/variant/ec.h
new file mode 100644
index 0000000000..7a2a6ff8b7
--- /dev/null
+++ b/src/mainboard/google/volteer/variants/collis/include/variant/ec.h
@@ -0,0 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
+#ifndef __VARIANT_EC_H__
+#define __VARIANT_EC_H__
+
+#include <baseboard/ec.h>
+
+#endif
diff --git a/src/mainboard/google/volteer/variants/collis/include/variant/gpio.h b/src/mainboard/google/volteer/variants/collis/include/variant/gpio.h
new file mode 100644
index 0000000000..b5fa8c5485
--- /dev/null
+++ b/src/mainboard/google/volteer/variants/collis/include/variant/gpio.h
@@ -0,0 +1,15 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
+#ifndef VARIANT_GPIO_H
+#define VARIANT_GPIO_H
+
+#include <baseboard/gpio.h>
+
+/* Memory configuration board straps */
+/* Copied from baseboard and may need to change for the new variant. */
+#define GPIO_MEM_CONFIG_0 GPP_C12
+#define GPIO_MEM_CONFIG_1 GPP_C15
+#define GPIO_MEM_CONFIG_2 GPP_C14
+#define GPIO_MEM_CONFIG_3 GPP_D15
+
+#endif
diff --git a/src/mainboard/google/volteer/variants/collis/memory/Makefile.inc b/src/mainboard/google/volteer/variants/collis/memory/Makefile.inc
new file mode 100644
index 0000000000..b0ca2223a8
--- /dev/null
+++ b/src/mainboard/google/volteer/variants/collis/memory/Makefile.inc
@@ -0,0 +1,5 @@
+## SPDX-License-Identifier: GPL-2.0-or-later
+## This is an auto-generated file. Do not edit!!
+## Add memory parts in mem_parts_used.txt and run spd_tools to regenerate.
+
+SPD_SOURCES = placeholder.spd.hex
diff --git a/src/mainboard/google/volteer/variants/collis/memory/dram_id.generated.txt b/src/mainboard/google/volteer/variants/collis/memory/dram_id.generated.txt
new file mode 100644
index 0000000000..fa247902ee
--- /dev/null
+++ b/src/mainboard/google/volteer/variants/collis/memory/dram_id.generated.txt
@@ -0,0 +1 @@
+DRAM Part Name ID to assign
diff --git a/src/mainboard/google/volteer/variants/collis/memory/mem_parts_used.txt b/src/mainboard/google/volteer/variants/collis/memory/mem_parts_used.txt
new file mode 100644
index 0000000000..e4258b530d
--- /dev/null
+++ b/src/mainboard/google/volteer/variants/collis/memory/mem_parts_used.txt
@@ -0,0 +1,11 @@
+# This is a CSV file containing a list of memory parts used by this variant.
+# One part per line with an optional fixed ID in column 2.
+# Only include a fixed ID if it is required for legacy reasons!
+# Generated IDs are dependent on the order of parts in this file,
+# so new parts must always be added at the end of the file!
+#
+# Generate an updated Makefile.inc and dram_id.generated.txt by running the
+# gen_part_id tool from util/spd_tools/{ddr4,lp4x}.
+# See util/spd_tools/{ddr4,lp4x}/README.md for more details and instructions.
+
+# Part Name
diff --git a/src/mainboard/google/volteer/variants/collis/overridetree.cb b/src/mainboard/google/volteer/variants/collis/overridetree.cb
new file mode 100644
index 0000000000..32204c58e7
--- /dev/null
+++ b/src/mainboard/google/volteer/variants/collis/overridetree.cb
@@ -0,0 +1,6 @@
+chip soc/intel/tigerlake
+
+ device domain 0 on
+ end
+
+end