diff options
| author | Tom Rini <trini@konsulko.com> | 2024-05-14 07:46:33 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2024-05-14 07:46:33 -0600 |
| commit | e7992828adcd5fad75bce9e6c41dfa9277ab93b0 (patch) | |
| tree | dcb6356b6af294979f388c78c6821a63c91d3275 /env | |
| parent | c67199962b2a819a4b0ae8d57dc68b7cadee0c9e (diff) | |
| parent | 42826664e4452304bdadc909d7c5f791d4abc552 (diff) | |
Merge branch '2024-05-13-assorted-updates' into next
- A few zfs fixes, ARMv8 timer cleanups, support more algorithms with
the nuvoton crypto driver, virtio + env in filesystem fix, K3 code
cleanup and warning fix in gen_compile_commands.
Diffstat (limited to 'env')
| -rw-r--r-- | env/ext4.c | 5 | ||||
| -rw-r--r-- | env/fat.c | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/env/ext4.c b/env/ext4.c index eb16568bd46..d92c844ea6c 100644 --- a/env/ext4.c +++ b/env/ext4.c @@ -31,6 +31,7 @@ #include <ext4fs.h> #include <mmc.h> #include <scsi.h> +#include <virtio.h> #include <asm/global_data.h> DECLARE_GLOBAL_DATA_PTR; @@ -150,6 +151,10 @@ static int env_ext4_load(void) if (!strcmp(ifname, "scsi")) scsi_scan(true); #endif +#if defined(CONFIG_VIRTIO) + if (!strcmp(ifname, "virtio")) + virtio_init(); +#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 2a40f123936..f3f8b7301ee 100644 --- a/env/fat.c +++ b/env/fat.c @@ -17,6 +17,7 @@ #include <fat.h> #include <mmc.h> #include <scsi.h> +#include <virtio.h> #include <asm/cache.h> #include <asm/global_data.h> #include <linux/stddef.h> @@ -133,6 +134,10 @@ static int env_fat_load(void) if (!strcmp(CONFIG_ENV_FAT_INTERFACE, "scsi")) scsi_scan(true); #endif +#if defined(CONFIG_VIRTIO) + if (!strcmp(ifname, "virtio")) + virtio_init(); +#endif #endif part = blk_get_device_part_str(ifname, dev_and_part, &dev_desc, &info, 1); |