summaryrefslogtreecommitdiff
path: root/src/mainboard/google/guybrush/variants
diff options
context:
space:
mode:
Diffstat (limited to 'src/mainboard/google/guybrush/variants')
-rw-r--r--src/mainboard/google/guybrush/variants/baseboard/helpers.c7
-rw-r--r--src/mainboard/google/guybrush/variants/guybrush/Makefile.inc5
-rw-r--r--src/mainboard/google/guybrush/variants/guybrush/variant.c9
3 files changed, 16 insertions, 5 deletions
diff --git a/src/mainboard/google/guybrush/variants/baseboard/helpers.c b/src/mainboard/google/guybrush/variants/baseboard/helpers.c
index 881c556f70..248e7a98ab 100644
--- a/src/mainboard/google/guybrush/variants/baseboard/helpers.c
+++ b/src/mainboard/google/guybrush/variants/baseboard/helpers.c
@@ -2,9 +2,6 @@
#include <baseboard/variants.h>
#include <device/device.h>
-#include <fw_config.h>
-#include <soc/iomap.h>
-#include <soc/pci_devs.h>
WEAK_DEV_PTR(fpmcu);
@@ -13,7 +10,7 @@ bool variant_has_fpmcu(void)
return is_dev_enabled(DEV_PTR(fpmcu));
}
-bool variant_has_pcie_wwan(void)
+bool __weak variant_has_pcie_wwan(void)
{
- return is_dev_enabled(DEV_PTR(gpp_bridge_2));
+ return false;
}
diff --git a/src/mainboard/google/guybrush/variants/guybrush/Makefile.inc b/src/mainboard/google/guybrush/variants/guybrush/Makefile.inc
index f7c97bafbf..d8a1beaf8f 100644
--- a/src/mainboard/google/guybrush/variants/guybrush/Makefile.inc
+++ b/src/mainboard/google/guybrush/variants/guybrush/Makefile.inc
@@ -1,7 +1,12 @@
# SPDX-License-Identifier: GPL-2.0-or-later
bootblock-y += gpio.c
+bootblock-y += variant.c
+
romstage-y += gpio.c
+romstage-y += variant.c
+
ramstage-y += gpio.c
+ramstage-y += variant.c
subdirs-y += ./memory
diff --git a/src/mainboard/google/guybrush/variants/guybrush/variant.c b/src/mainboard/google/guybrush/variants/guybrush/variant.c
new file mode 100644
index 0000000000..cde24cb9c0
--- /dev/null
+++ b/src/mainboard/google/guybrush/variants/guybrush/variant.c
@@ -0,0 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
+#include <baseboard/variants.h>
+#include <device/device.h>
+
+bool variant_has_pcie_wwan(void)
+{
+ return is_dev_enabled(DEV_PTR(gpp_bridge_2));
+}