|
@@ -90,15 +90,8 @@
|
|
|
#endif
|
|
|
|
|
|
#ifdef CONFIG_CMD_USB
|
|
|
-#define BOOTENV_RUN_USB_INIT "run usb_init; "
|
|
|
-#define BOOTENV_SET_USB_NEED_INIT "setenv usb_need_init; "
|
|
|
+#define BOOTENV_RUN_USB_INIT "usb start; "
|
|
|
#define BOOTENV_SHARED_USB \
|
|
|
- "usb_init=" \
|
|
|
- "if ${usb_need_init}; then " \
|
|
|
- "setenv usb_need_init false; " \
|
|
|
- "usb start 0; " \
|
|
|
- "fi\0" \
|
|
|
- \
|
|
|
"usb_boot=" \
|
|
|
BOOTENV_RUN_USB_INIT \
|
|
|
BOOTENV_SHARED_BLKDEV_BODY(usb)
|
|
@@ -106,7 +99,6 @@
|
|
|
#define BOOTENV_DEV_NAME_USB BOOTENV_DEV_NAME_BLKDEV
|
|
|
#else
|
|
|
#define BOOTENV_RUN_USB_INIT
|
|
|
-#define BOOTENV_SET_USB_NEED_INIT
|
|
|
#define BOOTENV_SHARED_USB
|
|
|
#define BOOTENV_DEV_USB \
|
|
|
BOOT_TARGET_DEVICES_references_USB_without_CONFIG_CMD_USB
|
|
@@ -202,7 +194,7 @@
|
|
|
\
|
|
|
BOOT_TARGET_DEVICES(BOOTENV_DEV) \
|
|
|
\
|
|
|
- "bootcmd=" BOOTENV_SET_USB_NEED_INIT BOOTENV_SET_SCSI_NEED_INIT \
|
|
|
+ "bootcmd=" BOOTENV_SET_SCSI_NEED_INIT \
|
|
|
"for target in ${boot_targets}; do " \
|
|
|
"run bootcmd_${target}; " \
|
|
|
"done\0"
|