aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrank Wu <frank_wu@compal.corp-partner.google.com>2020-03-13 16:41:10 +0800
committerPatrick Georgi <pgeorgi@google.com>2020-03-30 08:40:16 +0000
commitbc8373830128ff2991c1a8e9ff3e4255deefe746 (patch)
tree54589d14f044e2e5c728f83c3d70fd0f0312a7b5
parentd47afe90ef438cbeb4f60753d8674db2217d72b2 (diff)
volteer: Create halvor variant
Create the halvor variant of the volteer reference board by copying the template files to a new directory named for the variant. BUG=b:151399850 BRANCH=None TEST=util/abuild/abuild -p none -t google/volteer -x -a make sure the build includes GOOGLE_HALVOR Signed-off-by: Frank Wu <frank_wu@compal.corp-partner.google.com> Change-Id: If4d3417ba55d56af441c99d949a196328d7a1951 Reviewed-on: https://review.coreboot.org/c/coreboot/+/39667 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Caveh Jalali <caveh@chromium.org> Reviewed-by: EricR Lai <ericr_lai@compal.corp-partner.google.com> Reviewed-by: Paul Fagerburg <pfagerburg@chromium.org> Reviewed-by: Nick Vaccaro <nvaccaro@google.com>
-rw-r--r--src/mainboard/google/volteer/Kconfig2
-rw-r--r--src/mainboard/google/volteer/Kconfig.name8
-rw-r--r--src/mainboard/google/volteer/variants/halvor/Makefile.inc8
-rw-r--r--src/mainboard/google/volteer/variants/halvor/gpio.c37
-rw-r--r--src/mainboard/google/volteer/variants/halvor/include/variant/ec.h9
-rw-r--r--src/mainboard/google/volteer/variants/halvor/include/variant/gpio.h11
-rw-r--r--src/mainboard/google/volteer/variants/halvor/overridetree.cb4
7 files changed, 77 insertions, 2 deletions
diff --git a/src/mainboard/google/volteer/Kconfig b/src/mainboard/google/volteer/Kconfig
index 5bc487686e..54a8fecb4c 100644
--- a/src/mainboard/google/volteer/Kconfig
+++ b/src/mainboard/google/volteer/Kconfig
@@ -55,6 +55,7 @@ config MAINBOARD_FAMILY
config MAINBOARD_PART_NUMBER
string
+ default "Halvor" if BOARD_GOOGLE_HALVOR
default "Ripto" if BOARD_GOOGLE_RIPTO
default "Volteer" if BOARD_GOOGLE_VOLTEER
@@ -68,6 +69,7 @@ config TPM_TIS_ACPI_INTERRUPT
config VARIANT_DIR
string
+ default "halvor" if BOARD_GOOGLE_HALVOR
default "ripto" if BOARD_GOOGLE_RIPTO
default "volteer" if BOARD_GOOGLE_VOLTEER
diff --git a/src/mainboard/google/volteer/Kconfig.name b/src/mainboard/google/volteer/Kconfig.name
index d60dfb4807..596894effb 100644
--- a/src/mainboard/google/volteer/Kconfig.name
+++ b/src/mainboard/google/volteer/Kconfig.name
@@ -1,9 +1,13 @@
comment "Volteer"
-config BOARD_GOOGLE_VOLTEER
- bool "-> Volteer"
+config BOARD_GOOGLE_HALVOR
+ bool "-> Halvor"
select BOARD_GOOGLE_BASEBOARD_VOLTEER
config BOARD_GOOGLE_RIPTO
bool "-> Ripto"
select BOARD_GOOGLE_BASEBOARD_VOLTEER
+
+config BOARD_GOOGLE_VOLTEER
+ bool "-> Volteer"
+ select BOARD_GOOGLE_BASEBOARD_VOLTEER
diff --git a/src/mainboard/google/volteer/variants/halvor/Makefile.inc b/src/mainboard/google/volteer/variants/halvor/Makefile.inc
new file mode 100644
index 0000000000..a115fccb1f
--- /dev/null
+++ b/src/mainboard/google/volteer/variants/halvor/Makefile.inc
@@ -0,0 +1,8 @@
+# SPDX-License-Identifier: GPL-2.0-only
+# This file is part of the coreboot project.
+
+SPD_SOURCES =
+
+bootblock-y += gpio.c
+
+ramstage-y += gpio.c
diff --git a/src/mainboard/google/volteer/variants/halvor/gpio.c b/src/mainboard/google/volteer/variants/halvor/gpio.c
new file mode 100644
index 0000000000..6c4fb52f01
--- /dev/null
+++ b/src/mainboard/google/volteer/variants/halvor/gpio.c
@@ -0,0 +1,37 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+/* This file is part of the coreboot project. */
+
+#include <baseboard/gpio.h>
+#include <baseboard/variants.h>
+#include <commonlib/helpers.h>
+
+/* Pad configuration in ramstage */
+static const struct pad_config gpio_table[] = {
+
+};
+
+const struct pad_config *variant_base_gpio_table(size_t *num)
+{
+ *num = ARRAY_SIZE(gpio_table);
+ return gpio_table;
+}
+
+/* Early pad configuration in bootblock */
+static const struct pad_config early_gpio_table[] = {
+
+};
+
+const struct pad_config *variant_early_gpio_table(size_t *num)
+{
+ *num = ARRAY_SIZE(early_gpio_table);
+ return early_gpio_table;
+}
+
+static const struct cros_gpio cros_gpios[] = {
+};
+
+const struct cros_gpio *variant_cros_gpios(size_t *num)
+{
+ *num = ARRAY_SIZE(cros_gpios);
+ return cros_gpios;
+}
diff --git a/src/mainboard/google/volteer/variants/halvor/include/variant/ec.h b/src/mainboard/google/volteer/variants/halvor/include/variant/ec.h
new file mode 100644
index 0000000000..33e79711f6
--- /dev/null
+++ b/src/mainboard/google/volteer/variants/halvor/include/variant/ec.h
@@ -0,0 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+/* This file is part of the coreboot project. */
+
+#ifndef __VARIANT_EC_H__
+#define __VARIANT_EC_H__
+
+#include <baseboard/ec.h>
+
+#endif
diff --git a/src/mainboard/google/volteer/variants/halvor/include/variant/gpio.h b/src/mainboard/google/volteer/variants/halvor/include/variant/gpio.h
new file mode 100644
index 0000000000..55725ad59a
--- /dev/null
+++ b/src/mainboard/google/volteer/variants/halvor/include/variant/gpio.h
@@ -0,0 +1,11 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+/* This file is part of the coreboot project. */
+
+#ifndef VARIANT_GPIO_H
+#define VARIANT_GPIO_H
+
+#include <baseboard/gpio.h>
+
+/* Copied from baseboard and may need to change for the new variant. */
+
+#endif
diff --git a/src/mainboard/google/volteer/variants/halvor/overridetree.cb b/src/mainboard/google/volteer/variants/halvor/overridetree.cb
new file mode 100644
index 0000000000..75422d80bb
--- /dev/null
+++ b/src/mainboard/google/volteer/variants/halvor/overridetree.cb
@@ -0,0 +1,4 @@
+chip soc/intel/tigerlake
+ device domain 0 on
+ end
+end