[PATCH 0/2] Enable booting from SCSI on rockpro64-rk3399.
This patch series adds SCSI booting to rockchip-common.h to enable scsi boot options from distro boot, and enables SCSI options in the rockpro64-rk3399 configuration.
Vagrant Cascadian (2): rockchip: Enable SCSI in distro bootcmd for rk3399. rockchip: Enable AHCI/SCSI/SATA on rockpro64-rk3399.
configs/rockpro64-rk3399_defconfig | 7 +++++++ include/configs/rockchip-common.h | 7 +++++++ 2 files changed, 14 insertions(+)
Include SCSI in the list of boot targets if CONFIG_CMD_SCSI is enabled.
Signed-off-by: Vagrant Cascadian vagrant@debian.org ---
include/configs/rockchip-common.h | 7 +++++++ 1 file changed, 7 insertions(+)
diff --git a/include/configs/rockchip-common.h b/include/configs/rockchip-common.h index ba7061a287..0c08776ae2 100644 --- a/include/configs/rockchip-common.h +++ b/include/configs/rockchip-common.h @@ -29,6 +29,12 @@ #define BOOT_TARGET_NVME(func) #endif
+#if CONFIG_IS_ENABLED(CMD_SCSI) + #define BOOT_TARGET_SCSI(func) func(SCSI, scsi, 0) +#else + #define BOOT_TARGET_SCSI(func) +#endif + #if CONFIG_IS_ENABLED(CMD_USB) #define BOOT_TARGET_USB(func) func(USB, usb, 0) #else @@ -57,6 +63,7 @@ #define BOOT_TARGET_DEVICES(func) \ BOOT_TARGET_MMC(func) \ BOOT_TARGET_NVME(func) \ + BOOT_TARGET_SCSI(func) \ BOOT_TARGET_USB(func) \ BOOT_TARGET_PXE(func) \ BOOT_TARGET_DHCP(func) \
On 2022/4/7 04:42, Vagrant Cascadian wrote:
Include SCSI in the list of boot targets if CONFIG_CMD_SCSI is enabled.
Signed-off-by: Vagrant Cascadian vagrant@debian.org
Reviewed-by: Kever Yang kever.yang@rock-chips.com
Thanks, - Kever
include/configs/rockchip-common.h | 7 +++++++ 1 file changed, 7 insertions(+)
diff --git a/include/configs/rockchip-common.h b/include/configs/rockchip-common.h index ba7061a287..0c08776ae2 100644 --- a/include/configs/rockchip-common.h +++ b/include/configs/rockchip-common.h @@ -29,6 +29,12 @@ #define BOOT_TARGET_NVME(func) #endif
+#if CONFIG_IS_ENABLED(CMD_SCSI)
- #define BOOT_TARGET_SCSI(func) func(SCSI, scsi, 0)
+#else
- #define BOOT_TARGET_SCSI(func)
+#endif
- #if CONFIG_IS_ENABLED(CMD_USB) #define BOOT_TARGET_USB(func) func(USB, usb, 0) #else
@@ -57,6 +63,7 @@ #define BOOT_TARGET_DEVICES(func) \ BOOT_TARGET_MMC(func) \ BOOT_TARGET_NVME(func) \
- BOOT_TARGET_SCSI(func) \ BOOT_TARGET_USB(func) \ BOOT_TARGET_PXE(func) \ BOOT_TARGET_DHCP(func) \
Add options to enable AHCI, SCSI and SATA.
Signed-off-by: Vagrant Cascadian vagrant@debian.org ---
configs/rockpro64-rk3399_defconfig | 7 +++++++ 1 file changed, 7 insertions(+)
diff --git a/configs/rockpro64-rk3399_defconfig b/configs/rockpro64-rk3399_defconfig index d5e98a4f73..858410e8f7 100644 --- a/configs/rockpro64-rk3399_defconfig +++ b/configs/rockpro64-rk3399_defconfig @@ -28,6 +28,13 @@ CONFIG_CMD_GPT=y CONFIG_CMD_MMC=y CONFIG_CMD_PCI=y CONFIG_CMD_USB=y +CONFIG_AHCI=y +CONFIG_AHCI_PCI=y +CONFIG_SATA=y +CONFIG_SATA_SIL=y +CONFIG_SCSI=y +CONFIG_SCSI_AHCI=y +CONFIG_DM_SCSI=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_TIME=y CONFIG_SPL_OF_CONTROL=y
On 2022/4/7 04:42, Vagrant Cascadian wrote:
Add options to enable AHCI, SCSI and SATA.
Signed-off-by: Vagrant Cascadian vagrant@debian.org
Reviewed-by: Kever Yang kever.yang@rock-chips.com
Thanks, - Kever
configs/rockpro64-rk3399_defconfig | 7 +++++++ 1 file changed, 7 insertions(+)
diff --git a/configs/rockpro64-rk3399_defconfig b/configs/rockpro64-rk3399_defconfig index d5e98a4f73..858410e8f7 100644 --- a/configs/rockpro64-rk3399_defconfig +++ b/configs/rockpro64-rk3399_defconfig @@ -28,6 +28,13 @@ CONFIG_CMD_GPT=y CONFIG_CMD_MMC=y CONFIG_CMD_PCI=y CONFIG_CMD_USB=y +CONFIG_AHCI=y +CONFIG_AHCI_PCI=y +CONFIG_SATA=y +CONFIG_SATA_SIL=y +CONFIG_SCSI=y +CONFIG_SCSI_AHCI=y +CONFIG_DM_SCSI=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_TIME=y CONFIG_SPL_OF_CONTROL=y
participants (2)
-
Kever Yang -
Vagrant Cascadian