| Message ID | 20200524211034.38962-1-kettenis@openbsd.org |
|---|---|
| State | Accepted |
| Commit | 2e01e8f17fdc90e1b896b42b2e1bb3766211d3b5 |
| Delegated to: | Kever Yang |
| Headers | show |
| Series | rk3399: Enable NVMe distro bootcmd | expand |
On 2020/5/25 上午5:10, Mark Kettenis wrote: > Include NVME in the list of boot targets if CONFIG_NVME is enabled. > > Signed-off-by: Mark Kettenis <kettenis@openbsd.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 bf8c60d6dd..0b9e24d1db 100644 > --- a/include/configs/rockchip-common.h > +++ b/include/configs/rockchip-common.h > @@ -23,6 +23,12 @@ > #define BOOT_TARGET_MMC(func) > #endif > > +#if CONFIG_IS_ENABLED(CMD_NVME) > + #define BOOT_TARGET_NVME(func) func(NVME, nvme, 0) > +#else > + #define BOOT_TARGET_NVME(func) > +#endif > + > #if CONFIG_IS_ENABLED(CMD_USB) > #define BOOT_TARGET_USB(func) func(USB, usb, 0) > #else > @@ -50,6 +56,7 @@ > #ifdef CONFIG_ROCKCHIP_RK3399 > #define BOOT_TARGET_DEVICES(func) \ > BOOT_TARGET_MMC(func) \ > + BOOT_TARGET_NVME(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 bf8c60d6dd..0b9e24d1db 100644 --- a/include/configs/rockchip-common.h +++ b/include/configs/rockchip-common.h @@ -23,6 +23,12 @@ #define BOOT_TARGET_MMC(func) #endif +#if CONFIG_IS_ENABLED(CMD_NVME) + #define BOOT_TARGET_NVME(func) func(NVME, nvme, 0) +#else + #define BOOT_TARGET_NVME(func) +#endif + #if CONFIG_IS_ENABLED(CMD_USB) #define BOOT_TARGET_USB(func) func(USB, usb, 0) #else @@ -50,6 +56,7 @@ #ifdef CONFIG_ROCKCHIP_RK3399 #define BOOT_TARGET_DEVICES(func) \ BOOT_TARGET_MMC(func) \ + BOOT_TARGET_NVME(func) \ BOOT_TARGET_USB(func) \ BOOT_TARGET_PXE(func) \ BOOT_TARGET_DHCP(func) \
Include NVME in the list of boot targets if CONFIG_NVME is enabled. Signed-off-by: Mark Kettenis <kettenis@openbsd.org> --- include/configs/rockchip-common.h | 7 +++++++ 1 file changed, 7 insertions(+)