Furquan Shaikh merged this change.

View Change

Approvals: build bot (Jenkins): Verified Justin TerAvest: Looks good to me, approved
mb/google/octopus: Add custom SAR value for Vortininja

Vortininja needs different SAR values than meep. Use sku-id to load SAR values.

BUG=b:138261454
BRANCH=octopus
TEST=build and verified SAR values by sku id

Change-Id: I7b3ab51e1d6cada4faaba1b9d72bd9eacf6b04dd
Signed-off-by: Wisley Chen <wisley.chen@quanta.corp-partner.google.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/34653
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Justin TerAvest <teravest@chromium.org>
---
M src/mainboard/google/octopus/variants/meep/include/variant/sku.h
M src/mainboard/google/octopus/variants/meep/variant.c
2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/src/mainboard/google/octopus/variants/meep/include/variant/sku.h b/src/mainboard/google/octopus/variants/meep/include/variant/sku.h
index 1fd17ef..16a4eab 100644
--- a/src/mainboard/google/octopus/variants/meep/include/variant/sku.h
+++ b/src/mainboard/google/octopus/variants/meep/include/variant/sku.h
@@ -17,7 +17,10 @@
#define __MAINBOARD_SKU_H__

enum {
-
+ SKU_4_VORTININJA = 4, /* Stylus + rear camera */
+ SKU_5_VORTININJA = 5, /* Stylus + no rear camera */
+ SKU_6_VORTININJA = 6, /* no Stylus + rear camera */
+ SKU_7_VORTININJA = 7, /* no Stylus + no rear camera */
SKU_33_DORP = 33, /* HDMI */
SKU_34_DORP = 34, /* HDMI+Kblight */
SKU_35_DORP = 35, /* HDMI+TS */
diff --git a/src/mainboard/google/octopus/variants/meep/variant.c b/src/mainboard/google/octopus/variants/meep/variant.c
index 71e6eb4..ece8ff9 100644
--- a/src/mainboard/google/octopus/variants/meep/variant.c
+++ b/src/mainboard/google/octopus/variants/meep/variant.c
@@ -17,6 +17,23 @@
#include <drivers/intel/gma/opregion.h>
#include <baseboard/variants.h>
#include <variant/sku.h>
+#include <sar.h>
+
+const char *get_wifi_sar_cbfs_filename(void)
+{
+ const char *filename = NULL;
+ uint32_t sku_id = get_board_sku();
+
+ switch (sku_id) {
+ case SKU_4_VORTININJA:
+ case SKU_5_VORTININJA:
+ case SKU_6_VORTININJA:
+ case SKU_7_VORTININJA:
+ filename = "wifi_sar-vortininja.hex";
+ break;
+ }
+ return filename;
+}

const char *mainboard_vbt_filename(void)
{

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

Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I7b3ab51e1d6cada4faaba1b9d72bd9eacf6b04dd
Gerrit-Change-Number: 34653
Gerrit-PatchSet: 4
Gerrit-Owner: Chen Wisley <wisley.chen@quantatw.com>
Gerrit-Reviewer: Chen Wisley <wisley.chen@quantatw.com>
Gerrit-Reviewer: Furquan Shaikh <furquan@google.com>
Gerrit-Reviewer: Justin TerAvest <teravest@chromium.org>
Gerrit-Reviewer: Karthikeyan Ramasubramanian <kramasub@chromium.org>
Gerrit-Reviewer: Marco Chen <marcochen@google.com>
Gerrit-Reviewer: Wisley Chen <wisley.chen@quanta.corp-partner.google.com>
Gerrit-Reviewer: build bot (Jenkins) <no-reply@coreboot.org>
Gerrit-CC: Paul Menzel <paulepanter@users.sourceforge.net>
Gerrit-MessageType: merged