UPSTREAM: Revert "mb/google/octopus: Add custom SAR values for Bobba"
This reverts commit a914152fa6072c443ccd18de22412b47a228e754.
Reason for revert:
According to the partner on this project, custom values like this
are no longer necessary.
BUG=none
BRANCH=none
TEST=none
Change-Id: Idf483349c12aa618201b635248a4d2f2e22493f3
Signed-off-by: Patrick Georgi <pgeorgi@google.com>
Original-Commit-Id: 769fc2768e2b160eeb0d65e90756ddf9808bf59d
Original-Change-Id: I393eb4997f58abe0f77161999474994f06741519
Original-Signed-off-by: Justin TerAvest <teravest@chromium.org>
Original-Reviewed-on: https://review.coreboot.org/c/30347
Original-Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Original-Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/1390616
Commit-Ready: ChromeOS CL Exonerator Bot <chromiumos-cl-exonerator@appspot.gserviceaccount.com>
Tested-by: Patrick Georgi <pgeorgi@chromium.org>
Reviewed-by: Patrick Georgi <pgeorgi@chromium.org>
diff --git a/src/mainboard/google/octopus/variants/bobba/Makefile.inc b/src/mainboard/google/octopus/variants/bobba/Makefile.inc
index 152b46e..9fb63f5 100644
--- a/src/mainboard/google/octopus/variants/bobba/Makefile.inc
+++ b/src/mainboard/google/octopus/variants/bobba/Makefile.inc
@@ -1,4 +1,3 @@
bootblock-y += gpio.c
ramstage-y += gpio.c
-ramstage-y += mainboard.c
diff --git a/src/mainboard/google/octopus/variants/bobba/mainboard.c b/src/mainboard/google/octopus/variants/bobba/mainboard.c
deleted file mode 100644
index 61098b7..0000000
--- a/src/mainboard/google/octopus/variants/bobba/mainboard.c
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * 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 <boardid.h>
-#include <ec/google/chromeec/ec.h>
-#include <sar.h>
-
-const char *get_wifi_sar_cbfs_filename(void)
-{
- const char *filename = NULL;
- uint32_t sku_id;
- if (google_chromeec_cbi_get_sku_id(&sku_id))
- return NULL;
-
- switch (sku_id) {
- case 9:
- case 10:
- case 11:
- case 12:
- filename = "wifi_sar-bobba360.hex";
- break;
- }
- return filename;
-}
