Revert "board/zork: Remove BH720"
This reverts commit ca434375688b5d8049459ca5f871345bee9b1381.
Reason for revert: DUT can't boot from micro SD card in vilboz.
Original change's description:
> board/zork: Remove BH720
>
> We don't use the BH720 on the zork platform. This change reduces the
> boot time by 7ms.
>
> BUG=b:179303870
> BRANCH=zork
> TEST=boot on ezkinil
>
> Signed-off-by: Raul E Rangel <rrangel@chromium.org>
> Change-Id: I16afdef72f63e199a992185714db373fc4f625a8
> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/depthcharge/+/2676806
> Reviewed-by: Mathew King <mathewk@chromium.org>
> Reviewed-by: Martin Roth <martinroth@google.com>
Bug=b:184794421
Bug: b:179303870
Change-Id: I4cb987ef0894db2852e43d78b7d9c58f5a332c32
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/depthcharge/+/2814060
Auto-Submit: John Su <john_su@compal.corp-partner.google.com>
Reviewed-by: Peichao Wang <pwang12@lenovo.corp-partner.google.com>
Reviewed-by: Kangheui Won <khwon@chromium.org>
Tested-by: John Su <john_su@compal.corp-partner.google.com>
Commit-Queue: Kangheui Won <khwon@chromium.org>
diff --git a/board/zork/defconfig b/board/zork/defconfig
index e9d9838..cb030e0 100644
--- a/board/zork/defconfig
+++ b/board/zork/defconfig
@@ -41,6 +41,7 @@
CONFIG_DRIVER_STORAGE_MMC=y
CONFIG_DRIVER_STORAGE_NVME=y
CONFIG_DRIVER_STORAGE_SDHCI_PCI=y
+CONFIG_DRIVER_STORAGE_BAYHUB=y
CONFIG_DRIVER_TPM_CR50_I2C=y
# Picasso uses 32 MiB + ~2 MiB for coreboot so place the kernel at 64 MiB
diff --git a/src/board/zork/board.c b/src/board/zork/board.c
index 46a57cd..ef1d8bb 100644
--- a/src/board/zork/board.c
+++ b/src/board/zork/board.c
@@ -53,6 +53,9 @@
#define AMD_FAM17H_ACP_PCI_DID 0x15E2
/* SD Controllers */
+#define BH720_PCI_VID 0x1217
+#define BH720_PCI_DID 0x8621
+
#define GENESYS_PCI_VID 0x17a0
#define GL9755S_PCI_DID 0x9755
#define GL9750S_PCI_DID 0x9750
@@ -267,7 +270,11 @@
SdhciHost *sd = NULL;
pcidev_t pci_dev;
- if (pci_find_device(GENESYS_PCI_VID, GL9755S_PCI_DID,
+ if (pci_find_device(BH720_PCI_VID, BH720_PCI_DID, &pci_dev)) {
+ sd = new_bayhub_sdhci_host(pci_dev,
+ SDHCI_PLATFORM_REMOVABLE,
+ 0, 0);
+ } else if (pci_find_device(GENESYS_PCI_VID, GL9755S_PCI_DID,
&pci_dev)) {
sd = new_pci_sdhci_host(pci_dev,
SDHCI_PLATFORM_REMOVABLE,
