Sheng-Liang Pan has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/34542 )
Change subject: mb/google/octopus: Add custom SAR values for droid/blorb ......................................................................
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 --- M src/mainboard/google/octopus/variants/bobba/Makefile.inc A src/mainboard/google/octopus/variants/bobba/variant.c 2 files changed, 37 insertions(+), 0 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/42/34542/1
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..f25e2d7 --- /dev/null +++ b/src/mainboard/google/octopus/variants/bobba/variant.c @@ -0,0 +1,36 @@ +/* + * 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 <boardid.h> +#include <ec/google/chromeec/ec.h> +#include <sar.h> +#include <baseboard/variants.h> + +#define SKU_UNKNOWN 0xFFFFFFFF + +const char *get_wifi_sar_cbfs_filename(void) +{ + const char *filename = NULL; + uint32_t sku_id; + sku_id = get_board_sku(); + + if (sku_id == SKU_UNKNOWN) + return NULL; + + 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; +}
build bot (Jenkins) has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/34542 )
Change subject: mb/google/octopus: Add custom SAR values for droid/blorb ......................................................................
Patch Set 1:
(1 comment)
https://review.coreboot.org/c/coreboot/+/34542/1/src/mainboard/google/octopu... File src/mainboard/google/octopus/variants/bobba/variant.c:
https://review.coreboot.org/c/coreboot/+/34542/1/src/mainboard/google/octopu... PS1, Line 32: 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) line over 96 characters
Hello build bot (Jenkins), Patrick Georgi, Martin Roth,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/34542
to look at the new patch set (#2).
Change subject: mb/google/octopus: Add custom SAR values for droid/blorb ......................................................................
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 --- M src/mainboard/google/octopus/variants/bobba/Makefile.inc A src/mainboard/google/octopus/variants/bobba/variant.c 2 files changed, 38 insertions(+), 0 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/42/34542/2
build bot (Jenkins) has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/34542 )
Change subject: mb/google/octopus: Add custom SAR values for droid/blorb ......................................................................
Patch Set 2:
(1 comment)
https://review.coreboot.org/c/coreboot/+/34542/2/src/mainboard/google/octopu... File src/mainboard/google/octopus/variants/bobba/variant.c:
https://review.coreboot.org/c/coreboot/+/34542/2/src/mainboard/google/octopu... PS2, Line 32: if (sku_id == 33 || sku_id == 34 || sku_id == 35 || sku_id == 36 || sku_id == 41 || trailing whitespace
Sheng-Liang Pan has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/34542 )
Change subject: mb/google/octopus: Add custom SAR values for droid/blorb ......................................................................
Patch Set 2: Code-Review+1
Hello Marco Chen, Justin TerAvest, build bot (Jenkins), Furquan Shaikh, Patrick Georgi, Martin Roth,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/34542
to look at the new patch set (#3).
Change subject: mb/google/octopus: Add custom SAR values for droid/blorb ......................................................................
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 --- M src/mainboard/google/octopus/variants/bobba/Makefile.inc A src/mainboard/google/octopus/variants/bobba/variant.c 2 files changed, 38 insertions(+), 0 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/42/34542/3
Marco Chen has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/34542 )
Change subject: mb/google/octopus: Add custom SAR values for droid/blorb ......................................................................
Patch Set 3:
(2 comments)
https://review.coreboot.org/c/coreboot/+/34542/3/src/mainboard/google/octopu... File src/mainboard/google/octopus/variants/bobba/variant.c:
https://review.coreboot.org/c/coreboot/+/34542/3/src/mainboard/google/octopu... PS3, Line 17: #include <ec/google/chromeec/ec.h> We don't need these two header files?
https://review.coreboot.org/c/coreboot/+/34542/3/src/mainboard/google/octopu... PS3, Line 30: return NULL; Since filename is initialized to NULL, for sku_id not in the checking of line 32 we can just return NULL including SKU_UNKNOWN at line 36 already. As a result, we don't need this check and line 21?
Hello Marco Chen, Justin TerAvest, build bot (Jenkins), Furquan Shaikh, Patrick Georgi, Martin Roth,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/34542
to look at the new patch set (#4).
Change subject: mb/google/octopus: Add custom SAR values for droid/blorb ......................................................................
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 --- 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(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/42/34542/4
Sheng-Liang Pan has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/34542 )
Change subject: mb/google/octopus: Add custom SAR values for droid/blorb ......................................................................
Patch Set 4: Code-Review+1
Marco Chen has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/34542 )
Change subject: mb/google/octopus: Add custom SAR values for droid/blorb ......................................................................
Patch Set 4: Code-Review+1
Paul Menzel has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/34542 )
Change subject: mb/google/octopus: Add custom SAR values for droid/blorb ......................................................................
Patch Set 4: Code-Review+1
(1 comment)
https://review.coreboot.org/c/coreboot/+/34542/4//COMMIT_MSG Commit Message:
https://review.coreboot.org/c/coreboot/+/34542/4//COMMIT_MSG@9 PS4, Line 9: droid/blorb needs to use different SAR values than bobba. : Use sku-id to load the SAR values. Please use the full text width.
Hello Karthik Ramasubramanian, Marco Chen, Justin TerAvest, Paul Menzel, build bot (Jenkins), Furquan Shaikh, Patrick Georgi, Martin Roth,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/34542
to look at the new patch set (#5).
Change subject: mb/google/octopus: Add custom SAR values for droid/blorb ......................................................................
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 --- 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(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/42/34542/5
Justin TerAvest has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/34542 )
Change subject: mb/google/octopus: Add custom SAR values for droid/blorb ......................................................................
Patch Set 5: Code-Review+2
Martin Roth has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/34542 )
Change subject: mb/google/octopus: Add custom SAR values for droid/blorb ......................................................................
Patch Set 5:
(5 comments)
In the future, could you please mark all comments as resolved so that the patch can be merged.
https://review.coreboot.org/c/coreboot/+/34542/4//COMMIT_MSG Commit Message:
https://review.coreboot.org/c/coreboot/+/34542/4//COMMIT_MSG@9 PS4, Line 9: droid/blorb needs to use different SAR values than bobba. : Use sku-id to load the SAR values.
Please use the full text width.
Done
https://review.coreboot.org/c/coreboot/+/34542/1/src/mainboard/google/octopu... File src/mainboard/google/octopus/variants/bobba/variant.c:
https://review.coreboot.org/c/coreboot/+/34542/1/src/mainboard/google/octopu... PS1, Line 32: 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)
line over 96 characters
Done
https://review.coreboot.org/c/coreboot/+/34542/2/src/mainboard/google/octopu... File src/mainboard/google/octopus/variants/bobba/variant.c:
https://review.coreboot.org/c/coreboot/+/34542/2/src/mainboard/google/octopu... PS2, Line 32: if (sku_id == 33 || sku_id == 34 || sku_id == 35 || sku_id == 36 || sku_id == 41 ||
trailing whitespace
Done
https://review.coreboot.org/c/coreboot/+/34542/3/src/mainboard/google/octopu... File src/mainboard/google/octopus/variants/bobba/variant.c:
https://review.coreboot.org/c/coreboot/+/34542/3/src/mainboard/google/octopu... PS3, Line 17: #include <ec/google/chromeec/ec.h>
We don't need these two header files?
Done
https://review.coreboot.org/c/coreboot/+/34542/3/src/mainboard/google/octopu... PS3, Line 30: return NULL;
Since filename is initialized to NULL, for sku_id not in the checking of line 32 we can just return […]
Done
Martin Roth has submitted this change and it was merged. ( https://review.coreboot.org/c/coreboot/+/34542 )
Change subject: mb/google/octopus: Add custom SAR values for droid/blorb ......................................................................
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(-)
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
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; +}
-
build bot (Jenkins) (Code Review) -
Justin TerAvest (Code Review)
-
Marco Chen (Code Review)
-
Martin Roth (Code Review)
-
Paul Menzel (Code Review)
-
Sheng-Liang Pan (Code Review)