Kevin Chiu has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/44634 )
Change subject: mb/google/zork: support custom WiFi SAR for morphius ......................................................................
mb/google/zork: support custom WiFi SAR for morphius
BUG=b:159304570 BRANCH=master TEST=1. cros-workon-zork start coreboot-private-files-zork 2. emerge-zork chromeos-config coreboot-private-files-zork \ coreboot chromeos-bootimage 3. check WiFi SAR in ACPI table
Change-Id: Ibf1cca8a039e37acbbd9f97ee6a35414ceb3ca6e Signed-off-by: Kevin Chiu kevin.chiu@quantatw.com --- M src/mainboard/google/zork/Kconfig M src/mainboard/google/zork/variants/morphius/Makefile.inc A src/mainboard/google/zork/variants/morphius/variant.c 3 files changed, 34 insertions(+), 0 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/34/44634/1
diff --git a/src/mainboard/google/zork/Kconfig b/src/mainboard/google/zork/Kconfig index 24c49c1..295f0b9 100644 --- a/src/mainboard/google/zork/Kconfig +++ b/src/mainboard/google/zork/Kconfig @@ -256,4 +256,13 @@ int default 0
+config CHROMEOS_WIFI_SAR + bool "Enable SAR options for Chrome OS build" + default y if CHROMEOS + select DSAR_ENABLE + select SAR_ENABLE + select USE_SAR + select GEO_SAR_ENABLE + select WIFI_SAR_CBFS + endif # BOARD_GOOGLE_BASEBOARD_TREMBYLE || BOARD_GOOGLE_BASEBOARD_DALBOZ diff --git a/src/mainboard/google/zork/variants/morphius/Makefile.inc b/src/mainboard/google/zork/variants/morphius/Makefile.inc index 57e7136..51d19fe 100644 --- a/src/mainboard/google/zork/variants/morphius/Makefile.inc +++ b/src/mainboard/google/zork/variants/morphius/Makefile.inc @@ -3,3 +3,4 @@ subdirs-y += ./spd
ramstage-y += gpio.c +ramstage-y += variant.c diff --git a/src/mainboard/google/zork/variants/morphius/variant.c b/src/mainboard/google/zork/variants/morphius/variant.c new file mode 100644 index 0000000..6190244 --- /dev/null +++ b/src/mainboard/google/zork/variants/morphius/variant.c @@ -0,0 +1,24 @@ +/* + * This file is part of the coreboot project. + * + * Copyright 2020 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 <ec/google/chromeec/ec.h> +#include <sar.h> + +const char *get_wifi_sar_cbfs_filename(void) +{ + const char *filename = NULL; + filename = "wifi_sar-morphius.hex"; + return filename; +}
Hello Furquan Shaikh, Patrick Georgi, Martin Roth, Keith Tzeng, Aaron Durbin,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/44634
to look at the new patch set (#2).
Change subject: mb/google/zork: support custom WiFi SAR for morphius ......................................................................
mb/google/zork: support custom WiFi SAR for morphius
BUG=b:159304570 BRANCH=master TEST=1. cros-workon-zork start coreboot-private-files-zork 2. emerge-zork chromeos-config coreboot-private-files-zork \ coreboot chromeos-bootimage 3. check WiFi SAR in ACPI table
Change-Id: Ibf1cca8a039e37acbbd9f97ee6a35414ceb3ca6e Signed-off-by: Kevin Chiu kevin.chiu@quantatw.com --- M src/mainboard/google/zork/Kconfig M src/mainboard/google/zork/variants/morphius/Makefile.inc A src/mainboard/google/zork/variants/morphius/variant.c 3 files changed, 33 insertions(+), 0 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/34/44634/2
Hello build bot (Jenkins), Furquan Shaikh, Patrick Georgi, Martin Roth, Keith Tzeng, Aaron Durbin,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/44634
to look at the new patch set (#3).
Change subject: mb/google/zork: support custom WiFi SAR for morphius ......................................................................
mb/google/zork: support custom WiFi SAR for morphius
BUG=b:159304570 BRANCH=master TEST=1. cros-workon-zork start coreboot-private-files-zork 2. emerge-zork chromeos-config coreboot-private-files-zork \ coreboot chromeos-bootimage 3. check WiFi SAR in ACPI table
Change-Id: Ibf1cca8a039e37acbbd9f97ee6a35414ceb3ca6e Signed-off-by: Kevin Chiu kevin.chiu@quantatw.com --- M src/mainboard/google/zork/Kconfig M src/mainboard/google/zork/variants/morphius/Makefile.inc A src/mainboard/google/zork/variants/morphius/variant.c 3 files changed, 20 insertions(+), 0 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/34/44634/3
Aaron Durbin has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/44634 )
Change subject: mb/google/zork: support custom WiFi SAR for morphius ......................................................................
Patch Set 3:
(2 comments)
make[1]: *** No rule to make target 'src/mainboard/google/zork/wifi_sar_defaults.hex'
I put some suggestions in comments on how to make this work.
https://review.coreboot.org/c/coreboot/+/44634/3/src/mainboard/google/zork/K... File src/mainboard/google/zork/Kconfig:
https://review.coreboot.org/c/coreboot/+/44634/3/src/mainboard/google/zork/K... PS3, Line 260: bool "Enable SAR options for Chrome OS build" By not making things default to 'y' would follow how hatch and drallion implemented it. We'd put that selection into the chromium sys-boot/coreboot/files/config.X files for selecting it as well as setting WIFI_SAR_CBFS_FILEPATH to the correct file path during build.
https://review.coreboot.org/c/coreboot/+/44634/3/src/mainboard/google/zork/v... File src/mainboard/google/zork/variants/morphius/variant.c:
https://review.coreboot.org/c/coreboot/+/44634/3/src/mainboard/google/zork/v... PS3, Line 9: return filename; Just return "wifi_sar-morphius.hex". But I think the better option would be to make this string a Kconfig option. Then a common piece of code could just 'return CONFIG_WIFI_WAR_CBFS_FILENAME;'
Aaron Durbin has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/44634 )
Change subject: mb/google/zork: support custom WiFi SAR for morphius ......................................................................
Patch Set 3:
(1 comment)
https://review.coreboot.org/c/coreboot/+/44634/3/src/mainboard/google/zork/K... File src/mainboard/google/zork/Kconfig:
https://review.coreboot.org/c/coreboot/+/44634/3/src/mainboard/google/zork/K... PS3, Line 260: bool "Enable SAR options for Chrome OS build"
By not making things default to 'y' would follow how hatch and drallion implemented it. […]
Looks like you have what I suggested covered. I suggest you remove the WIFI_SAR_CBFS option below and the "help string" then this patch will build. However, please update the code in src/vendorcode/google/chromeos/sar.c as I suggested in a separate patch. With that I think it'll all work.
Hello build bot (Jenkins), Furquan Shaikh, Patrick Georgi, Martin Roth, Keith Tzeng, Aaron Durbin,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/44634
to look at the new patch set (#4).
Change subject: mb/google/zork: Enable WiFi SAR configs ......................................................................
mb/google/zork: Enable WiFi SAR configs
BUG=b:159304570 BRANCH=master TEST=1. cros-workon-zork start coreboot-private-files-zork 2. emerge-zork chromeos-config coreboot-private-files-zork \ coreboot chromeos-bootimage
Change-Id: Ibf1cca8a039e37acbbd9f97ee6a35414ceb3ca6e Signed-off-by: Kevin Chiu kevin.chiu@quantatw.com --- M src/mainboard/google/zork/Kconfig 1 file changed, 8 insertions(+), 0 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/34/44634/4
Kevin Chiu has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/44634 )
Change subject: mb/google/zork: Enable WiFi SAR configs ......................................................................
Patch Set 4:
(1 comment)
https://review.coreboot.org/c/coreboot/+/44634/3/src/mainboard/google/zork/v... File src/mainboard/google/zork/variants/morphius/variant.c:
https://review.coreboot.org/c/coreboot/+/44634/3/src/mainboard/google/zork/v... PS3, Line 9: return filename;
Just return "wifi_sar-morphius.hex". […]
Hi Aaron, so now there is no need to add additional CONFIG(WIFI_WAR_CBFS_FILENAME) in config.X for "wifi_sar-morphius.hex"? thanks.
Aaron Durbin has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/44634 )
Change subject: mb/google/zork: Enable WiFi SAR configs ......................................................................
Patch Set 4:
(1 comment)
https://review.coreboot.org/c/coreboot/+/44634/3/src/mainboard/google/zork/v... File src/mainboard/google/zork/variants/morphius/variant.c:
https://review.coreboot.org/c/coreboot/+/44634/3/src/mainboard/google/zork/v... PS3, Line 9: return filename;
Hi Aaron, […]
Yes. We can remove this entirely w/ an update to sar.c of using the default filename.
Kevin Chiu has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/44634 )
Change subject: mb/google/zork: Enable WiFi SAR configs ......................................................................
Patch Set 5:
(2 comments)
https://review.coreboot.org/c/coreboot/+/44634/3/src/mainboard/google/zork/K... File src/mainboard/google/zork/Kconfig:
https://review.coreboot.org/c/coreboot/+/44634/3/src/mainboard/google/zork/K... PS3, Line 260: bool "Enable SAR options for Chrome OS build"
Looks like you have what I suggested covered. […]
Done
https://review.coreboot.org/c/coreboot/+/44634/3/src/mainboard/google/zork/v... File src/mainboard/google/zork/variants/morphius/variant.c:
https://review.coreboot.org/c/coreboot/+/44634/3/src/mainboard/google/zork/v... PS3, Line 9: return filename;
Yes. We can remove this entirely w/ an update to sar.c of using the default filename.
Done
Aaron Durbin has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/44634 )
Change subject: mb/google/zork: Enable WiFi SAR configs ......................................................................
Patch Set 5: Code-Review+2
Furquan Shaikh has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/44634 )
Change subject: mb/google/zork: Enable WiFi SAR configs ......................................................................
Patch Set 5: Code-Review+2
Aaron Durbin has submitted this change. ( https://review.coreboot.org/c/coreboot/+/44634 )
Change subject: mb/google/zork: Enable WiFi SAR configs ......................................................................
mb/google/zork: Enable WiFi SAR configs
BUG=b:159304570 BRANCH=master TEST=1. cros-workon-zork start coreboot-private-files-zork 2. emerge-zork chromeos-config coreboot-private-files-zork \ coreboot chromeos-bootimage
Change-Id: Ibf1cca8a039e37acbbd9f97ee6a35414ceb3ca6e Signed-off-by: Kevin Chiu kevin.chiu@quantatw.com Reviewed-on: https://review.coreboot.org/c/coreboot/+/44634 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Aaron Durbin adurbin@chromium.org Reviewed-by: Furquan Shaikh furquan@google.com --- M src/mainboard/google/zork/Kconfig 1 file changed, 8 insertions(+), 0 deletions(-)
Approvals: build bot (Jenkins): Verified Aaron Durbin: Looks good to me, approved Furquan Shaikh: Looks good to me, approved
diff --git a/src/mainboard/google/zork/Kconfig b/src/mainboard/google/zork/Kconfig index e20b255..51e5144 100644 --- a/src/mainboard/google/zork/Kconfig +++ b/src/mainboard/google/zork/Kconfig @@ -257,4 +257,12 @@ int default 0
+config CHROMEOS_WIFI_SAR + bool + default y if CHROMEOS + select DSAR_ENABLE + select SAR_ENABLE + select USE_SAR + select GEO_SAR_ENABLE + endif # BOARD_GOOGLE_BASEBOARD_TREMBYLE || BOARD_GOOGLE_BASEBOARD_DALBOZ
-
Aaron Durbin (Code Review) -
Furquan Shaikh (Code Review)
-
Kevin Chiu (Code Review)