diff options
| author | Tom Rini <[email protected]> | 2022-07-08 12:38:03 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2022-07-08 12:38:03 -0400 |
| commit | 7bc0be96f79344d7b103dd64c31be0574f7b39e9 (patch) | |
| tree | 33251d05271c64614671b46ab1bb5522535a4594 /env | |
| parent | ea92f95d630cba9c3a324d250258ad2e35d9c997 (diff) | |
| parent | 5004901efb3b47f7fb22b29cdd127245d3814fd2 (diff) | |
Merge branch '2022-07-08-assorted-updates' into next
- Assorted bugfixes and improvements
Diffstat (limited to 'env')
| -rw-r--r-- | env/ext4.c | 5 | ||||
| -rw-r--r-- | env/fat.c | 8 |
2 files changed, 12 insertions, 1 deletions
diff --git a/env/ext4.c b/env/ext4.c index 9f65afb8a42..47e05a48919 100644 --- a/env/ext4.c +++ b/env/ext4.c @@ -31,6 +31,7 @@ #include <errno.h> #include <ext4fs.h> #include <mmc.h> +#include <scsi.h> #include <asm/global_data.h> DECLARE_GLOBAL_DATA_PTR; @@ -146,6 +147,10 @@ static int env_ext4_load(void) if (!strcmp(ifname, "mmc")) mmc_initialize(NULL); #endif +#if defined(CONFIG_AHCI) || defined(CONFIG_SCSI) + if (!strcmp(ifname, "scsi")) + scsi_scan(true); +#endif part = blk_get_device_part_str(ifname, dev_and_part, &dev_desc, &info, 1); diff --git a/env/fat.c b/env/fat.c index 6251d9649b1..3172130d75d 100644 --- a/env/fat.c +++ b/env/fat.c @@ -17,6 +17,7 @@ #include <errno.h> #include <fat.h> #include <mmc.h> +#include <scsi.h> #include <asm/cache.h> #include <asm/global_data.h> #include <linux/stddef.h> @@ -128,7 +129,12 @@ static int env_fat_load(void) if (!strcmp(ifname, "mmc")) mmc_initialize(NULL); #endif - +#ifndef CONFIG_SPL_BUILD +#if defined(CONFIG_AHCI) || defined(CONFIG_SCSI) + if (!strcmp(CONFIG_ENV_FAT_INTERFACE, "scsi")) + scsi_scan(true); +#endif +#endif part = blk_get_device_part_str(ifname, dev_and_part, &dev_desc, &info, 1); if (part < 0) |