| Message ID | 20220406204204.60328-2-vagrant@debian.org |
|---|---|
| State | Accepted |
| Commit | 48cd7a1f6ccb7d971460e95a2b6c053d6e2a28d1 |
| Delegated to: | Kever Yang |
| Headers | show |
| Series | Enable booting from SCSI on rockpro64-rk3399. | expand |
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) \
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) \
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(+)