Add SCSI scan for ENV in EXT4 or FAT
Hi
This updated version of the patch fixes a problem noticed by Stefan Roese where the CI build fails for the dra7xx_hs_evm_usb_defconfig target if this patch is included
Let me know if any other changes are needed.
Thanks and regards
Rogier
PATCH v2 1/1 Add SCSI scan for ENV in EXT4 or FAT
From: Rogier Stam <[email protected]>
When having environment stored in EXT4 or FAT and using an AHCI or SCSI device / partition the scan would not be performed early enough and hence the device would not be recognized. This change adds the scan when the interface is "scsi" in a similar way to mmc_initialize.
--- env/ext4.c | 5 +++++ env/fat.c | 8 +++++++- 2 files changed, 12 insertions(+), 1 deletion(-)
env/ext4.c +5 -0
@@ -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 );
env/fat.c +7 -1
@@ -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 )
Signature · 1 line
2.7.4
Quoted 11 lines · On Wed, May 11, 2022 at 11:20:28PM +0200, [email protected] wrote:
From: Rogier Stam <[email protected]>
When having environment stored in EXT4 or FAT and using an AHCI or SCSI device / partition the scan would not be performed early enough and hence the device would not be recognized. This change adds the scan when the interface is "scsi" in a similar way to
mmc_initialize.Signed-off-by Rogier Stam <[email protected]>Reviewed-by Pali Rohár <[email protected]>
Applied to u-boot/next, thanks!
Signature · 1 line
Tom