From: Heinrich Schuchardt heinrich.schuchardt@canonical.com Date: Wed, 25 Aug 2021 18:21:57 +0200

On the HiFive Unmatched a PCI to SATA adapter may be used to install a SATA drive. Enable booting from it.

Signed-off-by: Heinrich Schuchardt heinrich.schuchardt@canonical.com

Reviewed-by: Mark Kettenis kettenis@openbsd.org

---

configs/sifive_unmatched_defconfig | 5 +++++ include/configs/sifive-unmatched.h | 3 +++ 2 files changed, 8 insertions(+)

diff --git a/configs/sifive_unmatched_defconfig b/configs/sifive_unmatched_defconfig index 38b7acd536..1dde98e0ae 100644 --- a/configs/sifive_unmatched_defconfig +++ b/configs/sifive_unmatched_defconfig @@ -7,6 +7,7 @@ CONFIG_DEFAULT_DEVICE_TREE="hifive-unmatched-a00" CONFIG_SPL_MMC_SUPPORT=y CONFIG_SPL=y CONFIG_SPL_SPI_SUPPORT=y +CONFIG_AHCI=y CONFIG_TARGET_SIFIVE_UNMATCHED=y CONFIG_ARCH_RV64I=y CONFIG_RISCV_SMODE=y @@ -28,12 +29,16 @@ CONFIG_CMD_GPT_RENAME=y CONFIG_CMD_PCI=y CONFIG_CMD_USB=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_SCSI_AHCI=y +CONFIG_AHCI_PCI=y CONFIG_SPL_CLK=y CONFIG_E1000=y CONFIG_NVME=y CONFIG_PCI=y CONFIG_PCIE_DW_SIFIVE=y CONFIG_DM_RESET=y +CONFIG_SCSI=y +CONFIG_DM_SCSI=y CONFIG_USB=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_PCI=y diff --git a/include/configs/sifive-unmatched.h b/include/configs/sifive-unmatched.h index cb7f0c0fd9..f8ad2cce1f 100644 --- a/include/configs/sifive-unmatched.h +++ b/include/configs/sifive-unmatched.h @@ -40,6 +40,8 @@

#define CONFIG_SYS_CACHELINE_SIZE 64

+#define CONFIG_SYS_SCSI_MAX_SCSI_ID 4

/* Environment options */

#ifndef CONFIG_SPL_BUILD @@ -47,6 +49,7 @@ func(NVME, nvme, 0) \ func(USB, usb, 0) \ func(MMC, mmc, 0) \

• func(SCSI, scsi, 0) \ func(PXE, pxe, na) \ func(DHCP, dhcp, na)

-- 2.32.0