summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin TerAvest <teravest@chromium.org>2018-03-02 10:12:16 -0700
committerAaron Durbin <adurbin@chromium.org>2018-03-13 17:01:56 +0000
commit36c926d86ce7f45b5f0967dd054a7e8247aab193 (patch)
tree978d04b438d8bbc657c993700342e76e6869275e
parentdaec14da23af4867a1e3895d7fb41da0cbac7ec3 (diff)
downloadcoreboot-36c926d86ce7f45b5f0967dd054a7e8247aab193.tar.xz
mb/google/octopus: Add yorp variant
This creates a yorp variant for octopus; nothing too interesting now, just picks up values from the baseboard. BUG=b:74443669,b:74067452 TEST=Build Change-Id: I55af8f02d33138a3b6bab7860a665e3deb5595c2 Signed-off-by: Justin TerAvest <teravest@chromium.org> Reviewed-on: https://review.coreboot.org/25086 Reviewed-by: Furquan Shaikh <furquan@google.com> Reviewed-by: Aaron Durbin <adurbin@chromium.org> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
-rw-r--r--src/mainboard/google/octopus/Kconfig5
-rw-r--r--src/mainboard/google/octopus/Kconfig.name4
-rw-r--r--src/mainboard/google/octopus/variants/yorp/include/variant/acpi/dptf.asl16
-rw-r--r--src/mainboard/google/octopus/variants/yorp/include/variant/ec.h21
-rw-r--r--src/mainboard/google/octopus/variants/yorp/include/variant/gpio.h21
5 files changed, 66 insertions, 1 deletions
diff --git a/src/mainboard/google/octopus/Kconfig b/src/mainboard/google/octopus/Kconfig
index 0f30316c4b..4546e62d40 100644
--- a/src/mainboard/google/octopus/Kconfig
+++ b/src/mainboard/google/octopus/Kconfig
@@ -33,6 +33,7 @@ config MAINBOARD_DIR
config VARIANT_DIR
string
+ default "yorp" if BOARD_GOOGLE_YORP
default "octopus" if BOARD_GOOGLE_OCTOPUS
config DEVICETREE
@@ -41,15 +42,17 @@ config DEVICETREE
config MAINBOARD_PART_NUMBER
string
+ default "yorp" if BOARD_GOOGLE_YORP
default "octopus" if BOARD_GOOGLE_OCTOPUS
config MAINBOARD_FAMILY
string
- default "Google_Octopus" if BOARD_GOOGLE_OCTOPUS
+ default "Google_Octopus"
config GBB_HWID
string
depends on CHROMEOS
+ default "YORP TEST 7755" if BOARD_GOOGLE_YORP
default "OCTOPUS TEST 6859" if BOARD_GOOGLE_OCTOPUS
config MAX_CPUS
diff --git a/src/mainboard/google/octopus/Kconfig.name b/src/mainboard/google/octopus/Kconfig.name
index 5d375f743f..fa72b49c68 100644
--- a/src/mainboard/google/octopus/Kconfig.name
+++ b/src/mainboard/google/octopus/Kconfig.name
@@ -2,3 +2,7 @@ config BOARD_GOOGLE_OCTOPUS
bool "Octopus"
select BOARD_GOOGLE_BASEBOARD_OCTOPUS
select BASEBOARD_OCTOPUS_LAPTOP
+config BOARD_GOOGLE_YORP
+ bool "Yorp"
+ select BOARD_GOOGLE_BASEBOARD_OCTOPUS
+ select BASEBOARD_OCTOPUS_LAPTOP
diff --git a/src/mainboard/google/octopus/variants/yorp/include/variant/acpi/dptf.asl b/src/mainboard/google/octopus/variants/yorp/include/variant/acpi/dptf.asl
new file mode 100644
index 0000000000..cc17d560cf
--- /dev/null
+++ b/src/mainboard/google/octopus/variants/yorp/include/variant/acpi/dptf.asl
@@ -0,0 +1,16 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright 2018 Google LLC
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ */
+
+#include <baseboard/acpi/dptf.asl>
diff --git a/src/mainboard/google/octopus/variants/yorp/include/variant/ec.h b/src/mainboard/google/octopus/variants/yorp/include/variant/ec.h
new file mode 100644
index 0000000000..16f931b6cd
--- /dev/null
+++ b/src/mainboard/google/octopus/variants/yorp/include/variant/ec.h
@@ -0,0 +1,21 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright 2018 Google LLC
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ */
+
+#ifndef MAINBOARD_EC_H
+#define MAINBOARD_EC_H
+
+#include <baseboard/ec.h>
+
+#endif
diff --git a/src/mainboard/google/octopus/variants/yorp/include/variant/gpio.h b/src/mainboard/google/octopus/variants/yorp/include/variant/gpio.h
new file mode 100644
index 0000000000..1fd1e11716
--- /dev/null
+++ b/src/mainboard/google/octopus/variants/yorp/include/variant/gpio.h
@@ -0,0 +1,21 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright 2018 Google LLC
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.See the
+ * GNU General Public License for more details.
+ */
+
+#ifndef MAINBOARD_GPIO_H
+#define MAINBOARD_GPIO_H
+
+#include <baseboard/gpio.h>
+
+#endif /* MAINBOARD_GPIO_H */