diff options
| author | Hans de Goede <hdegoede@redhat.com> | 2014-09-16 09:26:23 +0200 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-09-24 18:30:28 -0400 |
| commit | a03bdaa1408be4e8b6adfc8577a0ceac3ebc51e5 (patch) | |
| tree | 72d1982f884525ee04a52565e6a9b38d111e593b | |
| parent | 535aad29f2a0881f66a0efdb3d467d0910d5e41e (diff) | |
| download | talos-obmc-uboot-a03bdaa1408be4e8b6adfc8577a0ceac3ebc51e5.tar.gz talos-obmc-uboot-a03bdaa1408be4e8b6adfc8577a0ceac3ebc51e5.zip | |
config_distro_bootcmd: Run 'scsi scan' before trying scsi disks
Scsi disks need to be probed before we try to access them, otherwise all
accesses fail with: ** Bad device size - scsi 0 **.
Reported-by: Karsten Merker <merker@debian.org>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Stephen Warren <swarren@nvidia.com>
Tested-by: Karsten Merker <merker@debian.org>
| -rw-r--r-- | include/config_distro_bootcmd.h | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/include/config_distro_bootcmd.h b/include/config_distro_bootcmd.h index 90d990157f..be616e8bfd 100644 --- a/include/config_distro_bootcmd.h +++ b/include/config_distro_bootcmd.h @@ -53,10 +53,23 @@ #endif #ifdef CONFIG_CMD_SCSI -#define BOOTENV_SHARED_SCSI BOOTENV_SHARED_BLKDEV(scsi) +#define BOOTENV_RUN_SCSI_INIT "run scsi_init; " +#define BOOTENV_SET_SCSI_NEED_INIT "setenv scsi_need_init; " +#define BOOTENV_SHARED_SCSI \ + "scsi_init=" \ + "if ${scsi_need_init}; then " \ + "setenv scsi_need_init false; " \ + "scsi scan; " \ + "fi\0" \ + \ + "scsi_boot=" \ + BOOTENV_RUN_SCSI_INIT \ + BOOTENV_SHARED_BLKDEV_BODY(scsi) #define BOOTENV_DEV_SCSI BOOTENV_DEV_BLKDEV #define BOOTENV_DEV_NAME_SCSI BOOTENV_DEV_NAME_BLKDEV #else +#define BOOTENV_RUN_SCSI_INIT +#define BOOTENV_SET_SCSI_NEED_INIT #define BOOTENV_SHARED_SCSI #define BOOTENV_DEV_SCSI \ BOOT_TARGET_DEVICES_references_SCSI_without_CONFIG_CMD_SCSI @@ -189,7 +202,7 @@ \ BOOT_TARGET_DEVICES(BOOTENV_DEV) \ \ - "bootcmd=" BOOTENV_SET_USB_NEED_INIT \ + "bootcmd=" BOOTENV_SET_USB_NEED_INIT BOOTENV_SET_SCSI_NEED_INIT \ "for target in ${boot_targets}; do " \ "run bootcmd_${target}; " \ "done\0" |
