Martin Roth merged this change.

View Change

Approvals: build bot (Jenkins): Verified Paul Menzel: Looks good to me, but someone else must approve Justin TerAvest: Looks good to me, approved Sheng-Liang Pan: Looks good to me, but someone else must approve Marco Chen: Looks good to me, but someone else must approve
mb/google/octopus: Add custom SAR values for droid/blorb

droid/blorb needs to use different SAR values than bobba. Use sku-id to load the SAR values.

BUG=b:138091179
BRANCH=octopus
TEST=build and verify SAR load by sku-id

Change-Id: I71b5d69ffbba82018a682202df73b604332dd9e7
Signed-off-by: Pan Sheng-Liang <sheng-liang.pan@quanta.corp-partner.google.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/34542
Reviewed-by: Justin TerAvest <teravest@chromium.org>
Reviewed-by: Marco Chen <marcochen@google.com>
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
---
M src/mainboard/google/octopus/variants/bobba/Makefile.inc
A src/mainboard/google/octopus/variants/bobba/variant.c
2 files changed, 30 insertions(+), 0 deletions(-)

diff --git a/src/mainboard/google/octopus/variants/bobba/Makefile.inc b/src/mainboard/google/octopus/variants/bobba/Makefile.inc
index 9fb63f5..ba865e9 100644
--- a/src/mainboard/google/octopus/variants/bobba/Makefile.inc
+++ b/src/mainboard/google/octopus/variants/bobba/Makefile.inc
@@ -1,3 +1,4 @@
bootblock-y += gpio.c

ramstage-y += gpio.c
+ramstage-y += variant.c
diff --git a/src/mainboard/google/octopus/variants/bobba/variant.c b/src/mainboard/google/octopus/variants/bobba/variant.c
new file mode 100644
index 0000000..05a331a
--- /dev/null
+++ b/src/mainboard/google/octopus/variants/bobba/variant.c
@@ -0,0 +1,29 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright 2019 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 <sar.h>
+#include <baseboard/variants.h>
+
+const char *get_wifi_sar_cbfs_filename(void)
+{
+ const char *filename = NULL;
+ uint32_t sku_id = get_board_sku();
+
+ if (sku_id == 33 || sku_id == 34 || sku_id == 35 || sku_id == 36 || sku_id == 41 ||
+ sku_id == 42 || sku_id == 43 || sku_id == 44)
+ filename = "wifi_sar-droid.hex";
+
+ return filename;
+}

To view, visit change 34542. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I71b5d69ffbba82018a682202df73b604332dd9e7
Gerrit-Change-Number: 34542
Gerrit-PatchSet: 6
Gerrit-Owner: Sheng-Liang Pan <sheng-liang.pan@quanta.corp-partner.google.com>
Gerrit-Reviewer: Furquan Shaikh <furquan@google.com>
Gerrit-Reviewer: Justin TerAvest <teravest@chromium.org>
Gerrit-Reviewer: Karthik Ramasubramanian <kramasub@google.com>
Gerrit-Reviewer: Marco Chen <marcochen@google.com>
Gerrit-Reviewer: Martin Roth <martinroth@google.com>
Gerrit-Reviewer: Patrick Georgi <pgeorgi@google.com>
Gerrit-Reviewer: Paul Menzel <paulepanter@users.sourceforge.net>
Gerrit-Reviewer: Sheng-Liang Pan <sheng-liang.pan@quanta.corp-partner.google.com>
Gerrit-Reviewer: build bot (Jenkins) <no-reply@coreboot.org>
Gerrit-MessageType: merged