Change in coreboot[master]: mb/google/octopus: Add custom SAR values for Bluebird

[shkim (Code Review)]

Hello Seunghwan Kim,

I'd like you to do a code review. Please visit

https://review.coreboot.org/c/coreboot/+/34080

to review the following change.

Change subject: mb/google/octopus: Add custom SAR values for Bluebird
......................................................................

mb/google/octopus: Add custom SAR values for Bluebird

Bluebird needs to use different SAR values than Casta.
Bluebird sku id is 2.

BUG=none
BRANCH=octopus
TEST=build

Change-Id: I107a8519832fcf906b94f958a3dc508d19bb4727
Signed-off-by: Seunghwan Kim 
---
M src/mainboard/google/octopus/variants/casta/Makefile.inc
A src/mainboard/google/octopus/variants/casta/mainboard.c
2 files changed, 34 insertions(+), 0 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/80/34080/1

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

ramstage-y += gpio.c
+ramstage-y += mainboard.c
diff --git a/src/mainboard/google/octopus/variants/casta/mainboard.c b/src/mainboard/google/octopus/variants/casta/mainboard.c
new file mode 100644
index 0000000..217a994
--- /dev/null
+++ b/src/mainboard/google/octopus/variants/casta/mainboard.c
@@ -0,0 +1,33 @@
+/*
+ * 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;
+
+	if (sku_id == 2) {
+		filename = "wifi_sar-bluebird.hex";
+	}
+
+	return filename;
+}

[build bot (Jenkins) (Code Review)]

build bot (Jenkins) has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/34080 )

Change subject: mb/google/octopus: Add custom SAR values for Bluebird
......................................................................

Patch Set 1:

(1 comment)

https://review.coreboot.org/c/coreboot/+/34080/1/src/mainboard/google/octopu... 
File src/mainboard/google/octopus/variants/casta/mainboard.c:

https://review.coreboot.org/c/coreboot/+/34080/1/src/mainboard/google/octopu... 
PS1, Line 28: 	if (sku_id == 2) {
braces {} are not necessary for single statement blocks

[shkim (Code Review)]

Hello Seunghwan Kim, Patrick Georgi, Martin Roth,

I'd like you to reexamine a change. Please visit

https://review.coreboot.org/c/coreboot/+/34080

to look at the new patch set (#2).

Change subject: mb/google/octopus: Add custom SAR values for Bluebird
......................................................................

mb/google/octopus: Add custom SAR values for Bluebird

Bluebird needs to use different SAR values than Casta.
Bluebird sku id is 2.

BUG=none
BRANCH=octopus
TEST=build

Change-Id: I107a8519832fcf906b94f958a3dc508d19bb4727
Signed-off-by: Seunghwan Kim 
---
M src/mainboard/google/octopus/variants/casta/Makefile.inc
A src/mainboard/google/octopus/variants/casta/mainboard.c
2 files changed, 33 insertions(+), 0 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/80/34080/2

[build bot (Jenkins) (Code Review)]

build bot (Jenkins) has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/34080 )

Change subject: mb/google/octopus: Add custom SAR values for Bluebird
......................................................................

Patch Set 2:

(1 comment)

https://review.coreboot.org/c/coreboot/+/34080/2/src/mainboard/google/octopu... 
File src/mainboard/google/octopus/variants/casta/mainboard.c:

https://review.coreboot.org/c/coreboot/+/34080/2/src/mainboard/google/octopu... 
PS2, Line 32: }
adding a line without newline at end of file

[Kevin Chiu (Code Review)]

Kevin Chiu has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/34080 )

Change subject: mb/google/octopus: Add custom SAR values for Bluebird
......................................................................

Patch Set 2:

(1 comment)

https://review.coreboot.org/c/coreboot/+/34080/2/src/mainboard/google/octopu... 
File src/mainboard/google/octopus/variants/casta/mainboard.c:

https://review.coreboot.org/c/coreboot/+/34080/2/src/mainboard/google/octopu... 
PS2, Line 25: google_chromeec_cbi_get_sku_id
now get_board_sku is a global function, it'll be good to use instead of calling google_chromeec_cbi_get_sku_id directly.

[shkim (Code Review)]

Hello Seunghwan Kim, build bot (Jenkins), Patrick Georgi, Martin Roth,

I'd like you to reexamine a change. Please visit

https://review.coreboot.org/c/coreboot/+/34080

to look at the new patch set (#3).

Change subject: mb/google/octopus: Add custom SAR values for Bluebird
......................................................................

mb/google/octopus: Add custom SAR values for Bluebird

Bluebird needs to use different SAR values than Casta.
Bluebird sku id is 2.

BUG=none
BRANCH=octopus
TEST=build

Change-Id: I107a8519832fcf906b94f958a3dc508d19bb4727
Signed-off-by: Seunghwan Kim 
---
M src/mainboard/google/octopus/variants/casta/Makefile.inc
A src/mainboard/google/octopus/variants/casta/mainboard.c
2 files changed, 34 insertions(+), 0 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/80/34080/3

[build bot (Jenkins) (Code Review)]

build bot (Jenkins) has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/34080 )

Change subject: mb/google/octopus: Add custom SAR values for Bluebird
......................................................................

Patch Set 3:

(1 comment)

https://review.coreboot.org/c/coreboot/+/34080/3/src/mainboard/google/octopu... 
File src/mainboard/google/octopus/variants/casta/mainboard.c:

https://review.coreboot.org/c/coreboot/+/34080/3/src/mainboard/google/octopu... 
PS3, Line 28: 	if (sku_id == 2) {
braces {} are not necessary for single statement blocks

[shkim (Code Review)]

Hello Seunghwan Kim, build bot (Jenkins), Patrick Georgi, Martin Roth,

I'd like you to reexamine a change. Please visit

https://review.coreboot.org/c/coreboot/+/34080

to look at the new patch set (#4).

Change subject: mb/google/octopus: Add custom SAR values for Bluebird
......................................................................

mb/google/octopus: Add custom SAR values for Bluebird

Bluebird needs to use different SAR values than Casta.
Bluebird sku id is 2.

BUG=none
BRANCH=octopus
TEST=build

Change-Id: I107a8519832fcf906b94f958a3dc508d19bb4727
Signed-off-by: Seunghwan Kim 
---
M src/mainboard/google/octopus/variants/casta/Makefile.inc
A src/mainboard/google/octopus/variants/casta/mainboard.c
2 files changed, 29 insertions(+), 0 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/80/34080/4

[SH Kim (Code Review)]

SH Kim has uploaded a new patch set (#5) to the change originally created by shkim. ( https://review.coreboot.org/c/coreboot/+/34080 )

Change subject: mb/google/octopus: Add custom SAR values for Bluebird
......................................................................

mb/google/octopus: Add custom SAR values for Bluebird

Bluebird needs to use different SAR values than Casta.
Bluebird sku id is 2.

CQ-DEPEND=CL:*1435310
BUG=none
BRANCH=octopus
TEST=build

Change-Id: I107a8519832fcf906b94f958a3dc508d19bb4727
Signed-off-by: Seunghwan Kim 
---
M src/mainboard/google/octopus/variants/casta/Makefile.inc
A src/mainboard/google/octopus/variants/casta/mainboard.c
2 files changed, 29 insertions(+), 0 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/80/34080/5

[SH Kim (Code Review)]

SH Kim has uploaded a new patch set (#6) to the change originally created by shkim. ( https://review.coreboot.org/c/coreboot/+/34080 )

Change subject: mb/google/octopus: Add custom SAR values for Bluebird
......................................................................

mb/google/octopus: Add custom SAR values for Bluebird

Bluebird needs to use different SAR values than Casta.
Bluebird sku id is 2.

CQ-DEPEND=CL:*1435310
BUG=b:129725065
BRANCH=octopus
TEST=build

Change-Id: I107a8519832fcf906b94f958a3dc508d19bb4727
Signed-off-by: Seunghwan Kim 
---
M src/mainboard/google/octopus/variants/casta/Makefile.inc
A src/mainboard/google/octopus/variants/casta/mainboard.c
2 files changed, 29 insertions(+), 0 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/80/34080/6

[Furquan Shaikh (Code Review)]

Furquan Shaikh has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/34080 )

Change subject: mb/google/octopus: Add custom SAR values for Bluebird
......................................................................

Patch Set 6:

(1 comment)

https://review.coreboot.org/c/coreboot/+/34080/6/src/mainboard/google/octopu... 
File src/mainboard/google/octopus/variants/casta/mainboard.c:

https://review.coreboot.org/c/coreboot/+/34080/6/src/mainboard/google/octopu... 
PS6, Line 4: 2018
2019?

[SH Kim (Code Review)]

SH Kim has uploaded a new patch set (#7) to the change originally created by shkim. ( https://review.coreboot.org/c/coreboot/+/34080 )

Change subject: mb/google/octopus: Add custom SAR values for Bluebird
......................................................................

mb/google/octopus: Add custom SAR values for Bluebird

Bluebird needs to use different SAR values than Casta.
Bluebird sku id is 2.

CQ-DEPEND=CL:*1435310
BUG=b:129725065
BRANCH=octopus
TEST=build

Change-Id: I107a8519832fcf906b94f958a3dc508d19bb4727
Signed-off-by: Seunghwan Kim 
---
M src/mainboard/google/octopus/variants/casta/Makefile.inc
A src/mainboard/google/octopus/variants/casta/mainboard.c
2 files changed, 29 insertions(+), 0 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/80/34080/7

[SH Kim (Code Review)]

SH Kim has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/34080 )

Change subject: mb/google/octopus: Add custom SAR values for Bluebird
......................................................................

Patch Set 7:

(1 comment)

https://review.coreboot.org/c/coreboot/+/34080/6/src/mainboard/google/octopu... 
File src/mainboard/google/octopus/variants/casta/mainboard.c:

https://review.coreboot.org/c/coreboot/+/34080/6/src/mainboard/google/octopu... 
PS6, Line 4: 2018
> 2019?

Done

[Furquan Shaikh (Code Review)]

Furquan Shaikh has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/34080 )

Change subject: mb/google/octopus: Add custom SAR values for Bluebird
......................................................................

Patch Set 7: Code-Review+2

(1 comment)

https://review.coreboot.org/c/coreboot/+/34080/7/src/mainboard/google/octopu... 
File src/mainboard/google/octopus/variants/casta/mainboard.c:

PS7: 
nit: The general rule seems to be to name this file as variant.c (see bloog/variant.c)

[SH Kim (Code Review)]

SH Kim has uploaded a new patch set (#8) to the change originally created by shkim. ( https://review.coreboot.org/c/coreboot/+/34080 )

Change subject: mb/google/octopus: Add custom SAR values for Bluebird
......................................................................

mb/google/octopus: Add custom SAR values for Bluebird

Bluebird needs to use different SAR values than Casta.
Bluebird sku id is 2.

CQ-DEPEND=CL:*1435310
BUG=b:129725065
BRANCH=octopus
TEST=build

Change-Id: I107a8519832fcf906b94f958a3dc508d19bb4727
Signed-off-by: Seunghwan Kim 
---
M src/mainboard/google/octopus/variants/casta/Makefile.inc
A src/mainboard/google/octopus/variants/casta/variant.c
2 files changed, 29 insertions(+), 0 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/80/34080/8

[Furquan Shaikh (Code Review)]

Furquan Shaikh has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/34080 )

Change subject: mb/google/octopus: Add custom SAR values for Bluebird
......................................................................

Patch Set 8: Code-Review+2

[Karthik Ramasubramanian (Code Review)]

Karthik Ramasubramanian has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/34080 )

Change subject: mb/google/octopus: Add custom SAR values for Bluebird
......................................................................

Patch Set 8: Code-Review+2

[SH Kim (Code Review)]

SH Kim has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/34080 )

Change subject: mb/google/octopus: Add custom SAR values for Bluebird
......................................................................

Patch Set 8:

Can we merge this change?

[Martin Roth (Code Review)]

Martin Roth has submitted this change and it was merged. ( https://review.coreboot.org/c/coreboot/+/34080 )

Change subject: mb/google/octopus: Add custom SAR values for Bluebird
......................................................................

mb/google/octopus: Add custom SAR values for Bluebird

Bluebird needs to use different SAR values than Casta.
Bluebird sku id is 2.

CQ-DEPEND=CL:*1435310
BUG=b:129725065
BRANCH=octopus
TEST=build

Change-Id: I107a8519832fcf906b94f958a3dc508d19bb4727
Signed-off-by: Seunghwan Kim 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/34080
Reviewed-by: Furquan Shaikh 
Reviewed-by: Karthik Ramasubramanian 
Tested-by: build bot (Jenkins) 
---
M src/mainboard/google/octopus/variants/casta/Makefile.inc
A src/mainboard/google/octopus/variants/casta/variant.c
2 files changed, 29 insertions(+), 0 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Furquan Shaikh: Looks good to me, approved
  Karthik Ramasubramanian: Looks good to me, approved

diff --git a/src/mainboard/google/octopus/variants/casta/Makefile.inc b/src/mainboard/google/octopus/variants/casta/Makefile.inc
index 9fb63f5..ba865e9 100644
--- a/src/mainboard/google/octopus/variants/casta/Makefile.inc
+++ b/src/mainboard/google/octopus/variants/casta/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/casta/variant.c b/src/mainboard/google/octopus/variants/casta/variant.c
new file mode 100644
index 0000000..89b1033
--- /dev/null
+++ b/src/mainboard/google/octopus/variants/casta/variant.c
@@ -0,0 +1,28 @@
+/*
+ * 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 <baseboard/variants.h>
+#include <sar.h>
+
+const char *get_wifi_sar_cbfs_filename(void)
+{
+	const char *filename = NULL;
+	uint32_t sku_id = get_board_sku();
+
+	if (sku_id == 2)
+		filename = "wifi_sar-bluebird.hex";
+
+	return filename;
+}