Skip to contentSkip to conversation

Enable booting from SCSI on rockpro64-rk3399.

PATCH In review Vagrant Cascadian 2 participants 5 messages Apr 6, 2022 – Apr 9, 2022 Arm Rockchip

lore
Share & tools
lore
#0 lore raw

cover 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(+)
Signature · 1 line
2.35.1
#1 lore raw

PATCH 1/2 rockchip: Enable SCSI in distro bootcmd for rk3399.

Include SCSI in the list of boot targets if CONFIG_CMD_SCSI is enabled.

---

 include/configs/rockchip-common.h | 7 +++++++
 1 file changed, 7 insertions(+)
include/configs/rockchip-common.h +7 -0
index ba7061a287..0c08776ae2 100644
@@ -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) \
Signature · 1 line
2.35.1
Reviewed-by on v1 1/2
#2 lore raw

Re: [PATCH 1/2] rockchip: Enable SCSI in distro bootcmd for rk3399.

Quoted 4 lines · Vagrant Cascadian

Include SCSI in the list of boot targets if CONFIG_CMD_SCSI is enabled.

Thanks,
- Kever

Quoted 30 lines

---

  include/configs/rockchip-common.h | 7 +++++++
  1 file changed, 7 insertions(+)
include/configs/rockchip-common.h +7 -0
index ba7061a287..0c08776ae2 100644
@@ -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) \
#3 lore raw

PATCH 2/2 rockchip: Enable AHCI/SCSI/SATA on rockpro64-rk3399.

In reply to Vagrant Cascadian

Add options to enable AHCI, SCSI and SATA.

---

 configs/rockpro64-rk3399_defconfig | 7 +++++++
 1 file changed, 7 insertions(+)
configs/rockpro64-rk3399_defconfig +7 -0
index d5e98a4f73..858410e8f7 100644
@@ -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
Signature · 1 line
2.35.1
Reviewed-by on v1 2/2
#4 lore raw

Re: [PATCH 2/2] rockchip: Enable AHCI/SCSI/SATA on rockpro64-rk3399.

Quoted 3 lines · Vagrant Cascadian

Add options to enable AHCI, SCSI and SATA.

Thanks,
- Kever

Quoted 23 lines

---

  configs/rockpro64-rk3399_defconfig | 7 +++++++
  1 file changed, 7 insertions(+)
configs/rockpro64-rk3399_defconfig +7 -0
index d5e98a4f73..858410e8f7 100644
@@ -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