Change in coreboot[master]: mb/google/zork: Use FW_CONFIG to enable/disable eMMC on Ezkinil
Bhanu Prakash Maiya has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/44423 )
Change subject: mb/google/zork: Use FW_CONFIG to enable/disable eMMC on Ezkinil ......................................................................
mb/google/zork: Use FW_CONFIG to enable/disable eMMC on Ezkinil
Currently SKU_ID is used to enable/disable eMMC as boot media on Ezkinil. This patch will check eMMC bit in firmware configuration table to enable/disable eMMC.
BRANCH=none BUG=b:162344105 TEST=Check eMMC is enabled or disabled based on the eMMC bit in FW_CONFIG.
Signed-off-by: Bhanu Prakash Maiya bhanumaiya@google.com Change-Id: I62318cf71ec70790f2d9e787febd1e0b787741fb --- M src/mainboard/google/zork/variants/ezkinil/variant.c 1 file changed, 6 insertions(+), 20 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/23/44423/1
diff --git a/src/mainboard/google/zork/variants/ezkinil/variant.c b/src/mainboard/google/zork/variants/ezkinil/variant.c index afc24a7..be0d2aa 100644 --- a/src/mainboard/google/zork/variants/ezkinil/variant.c +++ b/src/mainboard/google/zork/variants/ezkinil/variant.c @@ -5,31 +5,17 @@ #include <soc/pci_devs.h> #include <ec/google/chromeec/ec.h>
-static int sku_has_emmc(void) -{ - uint32_t board_sku = sku_id(); - - /* Factory flow requires all OS boot media to be enabled. */ - if (boot_is_factory_unprovisioned()) - return 1; - - if ((board_sku == 0x5A020000) || - (board_sku == 0x5A020001) || (board_sku == 0x5A020002) || - (board_sku == 0x5A020005) || (board_sku == 0x5A020006) || - (board_sku == 0x5A020009) || (board_sku == 0x5A02000A) || - (board_sku == 0x5A02000D) || (board_sku == 0x5A02000E) || - (board_sku == 0x5A020016) || (board_sku == 0x5A020017)) - return 1; - - return 0; -} - void variant_devtree_update(void) { struct soc_amd_picasso_config *cfg;
cfg = config_of_soc();
- if (!sku_has_emmc()) + /* + * Enable EMMC if FW_CONFIG_MASK_EMMC bit is set + * or FW boots on unprovisioned board in factory. + */ + if (!(variant_has_emmc() || + boot_is_factory_unprovisioned())) cfg->sd_emmc_config = SD_EMMC_DISABLE; }
Aaron Durbin has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/44423 )
Change subject: mb/google/zork: Use FW_CONFIG to enable/disable eMMC on Ezkinil ......................................................................
Patch Set 1:
(2 comments)
https://review.coreboot.org/c/coreboot/+/44423/1/src/mainboard/google/zork/v... File src/mainboard/google/zork/variants/ezkinil/variant.c:
https://review.coreboot.org/c/coreboot/+/44423/1/src/mainboard/google/zork/v... PS1, Line 16: * or FW boots on unprovisioned board in factory. Comment may fit on a single 96 col line.
https://review.coreboot.org/c/coreboot/+/44423/1/src/mainboard/google/zork/v... PS1, Line 18: if (!(variant_has_emmc() || This can be on one line.
Hello build bot (Jenkins), Furquan Shaikh, Aaron Durbin,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/44423
to look at the new patch set (#2).
Change subject: mb/google/zork: Use FW_CONFIG to enable/disable eMMC on Ezkinil ......................................................................
mb/google/zork: Use FW_CONFIG to enable/disable eMMC on Ezkinil
Currently SKU_ID is used to enable/disable eMMC as boot media on Ezkinil. This patch will check eMMC bit in firmware configuration table to enable/disable eMMC.
BRANCH=none BUG=b:162344105 TEST=Check eMMC is enabled or disabled based on the eMMC bit in FW_CONFIG.
Signed-off-by: Bhanu Prakash Maiya bhanumaiya@google.com Change-Id: I62318cf71ec70790f2d9e787febd1e0b787741fb --- M src/mainboard/google/zork/variants/ezkinil/variant.c 1 file changed, 4 insertions(+), 20 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/23/44423/2
Bhanu Prakash Maiya has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/44423 )
Change subject: mb/google/zork: Use FW_CONFIG to enable/disable eMMC on Ezkinil ......................................................................
Patch Set 2:
(2 comments)
https://review.coreboot.org/c/coreboot/+/44423/1/src/mainboard/google/zork/v... File src/mainboard/google/zork/variants/ezkinil/variant.c:
https://review.coreboot.org/c/coreboot/+/44423/1/src/mainboard/google/zork/v... PS1, Line 16: * or FW boots on unprovisioned board in factory.
Comment may fit on a single 96 col line.
Ack
https://review.coreboot.org/c/coreboot/+/44423/1/src/mainboard/google/zork/v... PS1, Line 18: if (!(variant_has_emmc() ||
This can be on one line.
Ack
Aaron Durbin has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/44423 )
Change subject: mb/google/zork: Use FW_CONFIG to enable/disable eMMC on Ezkinil ......................................................................
Patch Set 2: Code-Review+2
Furquan Shaikh has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/44423 )
Change subject: mb/google/zork: Use FW_CONFIG to enable/disable eMMC on Ezkinil ......................................................................
Patch Set 2: Code-Review+2
Aaron Durbin has submitted this change. ( https://review.coreboot.org/c/coreboot/+/44423 )
Change subject: mb/google/zork: Use FW_CONFIG to enable/disable eMMC on Ezkinil ......................................................................
mb/google/zork: Use FW_CONFIG to enable/disable eMMC on Ezkinil
Currently SKU_ID is used to enable/disable eMMC as boot media on Ezkinil. This patch will check eMMC bit in firmware configuration table to enable/disable eMMC.
BRANCH=none BUG=b:162344105 TEST=Check eMMC is enabled or disabled based on the eMMC bit in FW_CONFIG.
Signed-off-by: Bhanu Prakash Maiya bhanumaiya@google.com Change-Id: I62318cf71ec70790f2d9e787febd1e0b787741fb Reviewed-on: https://review.coreboot.org/c/coreboot/+/44423 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/variants/ezkinil/variant.c 1 file changed, 4 insertions(+), 20 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/variants/ezkinil/variant.c b/src/mainboard/google/zork/variants/ezkinil/variant.c index afc24a7..29a50bc 100644 --- a/src/mainboard/google/zork/variants/ezkinil/variant.c +++ b/src/mainboard/google/zork/variants/ezkinil/variant.c @@ -5,31 +5,15 @@ #include <soc/pci_devs.h> #include <ec/google/chromeec/ec.h>
-static int sku_has_emmc(void) -{ - uint32_t board_sku = sku_id(); - - /* Factory flow requires all OS boot media to be enabled. */ - if (boot_is_factory_unprovisioned()) - return 1; - - if ((board_sku == 0x5A020000) || - (board_sku == 0x5A020001) || (board_sku == 0x5A020002) || - (board_sku == 0x5A020005) || (board_sku == 0x5A020006) || - (board_sku == 0x5A020009) || (board_sku == 0x5A02000A) || - (board_sku == 0x5A02000D) || (board_sku == 0x5A02000E) || - (board_sku == 0x5A020016) || (board_sku == 0x5A020017)) - return 1; - - return 0; -} - void variant_devtree_update(void) { struct soc_amd_picasso_config *cfg;
cfg = config_of_soc();
- if (!sku_has_emmc()) + /* + * Enable eMMC if eMMC bit is set in FW_CONFIG or device is unprovisioned. + */ + if (!(variant_has_emmc() || boot_is_factory_unprovisioned())) cfg->sd_emmc_config = SD_EMMC_DISABLE; }
-
Aaron Durbin (Code Review) -
Bhanu Prakash Maiya (Code Review)
-
Furquan Shaikh (Code Review)