[Concept] [PATCH 04/19] fs: Rename fs.h to fs_legacy.h

From: Simon Glass <sjg@chromium.org> A new filesystem interface is coming, so rename the current header to indicate that it is the old one. Signed-off-by: Simon Glass <sjg@chromium.org> --- arch/arm/mach-k3/common.c | 2 +- board/gdsys/a38x/hre.c | 2 +- board/inversepath/usbarmory/usbarmory.c | 2 +- boot/bootdev-uclass.c | 2 +- boot/bootmeth-uclass.c | 2 +- boot/bootmeth_efi.c | 2 +- boot/bootmeth_extlinux.c | 2 +- boot/bootmeth_pxe.c | 2 +- boot/bootmeth_script.c | 2 +- cmd/addr_find.c | 2 +- cmd/btrfs.c | 2 +- cmd/cat.c | 2 +- cmd/cedit.c | 2 +- cmd/erofs.c | 2 +- cmd/ext2.c | 2 +- cmd/ext4.c | 2 +- cmd/fat.c | 2 +- cmd/fpga.c | 2 +- cmd/fs.c | 2 +- cmd/fs_uuid.c | 2 +- cmd/host.c | 2 +- cmd/mvebu/bubt.c | 2 +- cmd/pstore.c | 2 +- cmd/pxe.c | 2 +- cmd/sqfs.c | 2 +- cmd/sysboot.c | 2 +- cmd/test.c | 2 +- cmd/xxd.c | 2 +- common/board_f.c | 2 +- common/spl/spl_blk_fs.c | 2 +- common/splash_source.c | 2 +- drivers/bootcount/bootcount_fs.c | 2 +- drivers/fastboot/fb_getvar.c | 2 +- drivers/fpga/zynqpl.c | 2 +- drivers/misc/fs_loader.c | 2 +- drivers/net/phy/aquantia.c | 2 +- drivers/remoteproc/ipu_rproc.c | 2 +- fs/erofs/erofs_fs.h | 2 +- fs/exfat/io.c | 2 +- fs/fat/fat.c | 2 +- fs/fs.c | 2 +- fs/sandbox/hostfs_bootdev.c | 2 +- fs/sandbox/sandboxfs.c | 2 +- fs/semihostingfs.c | 2 +- fs/squashfs/sqfs.c | 2 +- fs/squashfs/sqfs_filesystem.h | 2 +- include/ext4fs.h | 2 +- include/fat.h | 2 +- include/{fs.h => fs_legacy.h} | 0 lib/efi_loader/efi_capsule.c | 2 +- lib/efi_loader/efi_disk.c | 2 +- lib/efi_loader/efi_file.c | 2 +- lib/efi_loader/efi_helper.c | 2 +- lib/efi_loader/efi_load_initrd.c | 2 +- lib/efi_loader/efi_var_file.c | 2 +- test/dm/host.c | 2 +- test/dm/rkmtd.c | 2 +- test/image/spl_load_fs.c | 2 +- 58 files changed, 57 insertions(+), 57 deletions(-) rename include/{fs.h => fs_legacy.h} (100%) diff --git a/arch/arm/mach-k3/common.c b/arch/arm/mach-k3/common.c index fa8cd93d664..aa53a1c474c 100644 --- a/arch/arm/mach-k3/common.c +++ b/arch/arm/mach-k3/common.c @@ -23,7 +23,7 @@ #include <asm/hardware.h> #include <asm/io.h> #include <fs_loader.h> -#include <fs.h> +#include <fs_legacy.h> #include <efi_loader.h> #include <env.h> #include <elf.h> diff --git a/board/gdsys/a38x/hre.c b/board/gdsys/a38x/hre.c index 06856ea36d3..c23d920849d 100644 --- a/board/gdsys/a38x/hre.c +++ b/board/gdsys/a38x/hre.c @@ -6,7 +6,7 @@ #include <log.h> #include <malloc.h> -#include <fs.h> +#include <fs_legacy.h> #include <i2c.h> #include <mmc.h> #include <tpm-v1.h> diff --git a/board/inversepath/usbarmory/usbarmory.c b/board/inversepath/usbarmory/usbarmory.c index fbed8abcecf..5d8491c2608 100644 --- a/board/inversepath/usbarmory/usbarmory.c +++ b/board/inversepath/usbarmory/usbarmory.c @@ -9,7 +9,7 @@ #include <config.h> #include <command.h> -#include <fs.h> +#include <fs_legacy.h> #include <init.h> #include <asm/global_data.h> #include <asm/io.h> diff --git a/boot/bootdev-uclass.c b/boot/bootdev-uclass.c index 76397a1a990..aaca2f12b5a 100644 --- a/boot/bootdev-uclass.c +++ b/boot/bootdev-uclass.c @@ -11,7 +11,7 @@ #include <bootflow.h> #include <bootmeth.h> #include <bootstd.h> -#include <fs.h> +#include <fs_legacy.h> #include <log.h> #include <malloc.h> #include <part.h> diff --git a/boot/bootmeth-uclass.c b/boot/bootmeth-uclass.c index 5f2e10c879b..f49e9c2a008 100644 --- a/boot/bootmeth-uclass.c +++ b/boot/bootmeth-uclass.c @@ -13,7 +13,7 @@ #include <bootstd.h> #include <dm.h> #include <env_internal.h> -#include <fs.h> +#include <fs_legacy.h> #include <malloc.h> #include <mapmem.h> #include <dm/uclass-internal.h> diff --git a/boot/bootmeth_efi.c b/boot/bootmeth_efi.c index 01cc7ec3bec..703c73c273d 100644 --- a/boot/bootmeth_efi.c +++ b/boot/bootmeth_efi.c @@ -15,7 +15,7 @@ #include <dm.h> #include <efi.h> #include <efi_loader.h> -#include <fs.h> +#include <fs_legacy.h> #include <malloc.h> #include <mapmem.h> #include <mmc.h> diff --git a/boot/bootmeth_extlinux.c b/boot/bootmeth_extlinux.c index 2a268cca9f7..782e5f7ec76 100644 --- a/boot/bootmeth_extlinux.c +++ b/boot/bootmeth_extlinux.c @@ -16,7 +16,7 @@ #include <command.h> #include <dm.h> #include <extlinux.h> -#include <fs.h> +#include <fs_legacy.h> #include <malloc.h> #include <mapmem.h> #include <mmc.h> diff --git a/boot/bootmeth_pxe.c b/boot/bootmeth_pxe.c index 4b5b88bae52..18d8ab446e0 100644 --- a/boot/bootmeth_pxe.c +++ b/boot/bootmeth_pxe.c @@ -14,7 +14,7 @@ #include <command.h> #include <dm.h> #include <extlinux.h> -#include <fs.h> +#include <fs_legacy.h> #include <log.h> #include <malloc.h> #include <mapmem.h> diff --git a/boot/bootmeth_script.c b/boot/bootmeth_script.c index b3a51a35e89..facd0a68d73 100644 --- a/boot/bootmeth_script.c +++ b/boot/bootmeth_script.c @@ -15,7 +15,7 @@ #include <bootstd.h> #include <dm.h> #include <env.h> -#include <fs.h> +#include <fs_legacy.h> #include <image.h> #include <malloc.h> #include <mapmem.h> diff --git a/cmd/addr_find.c b/cmd/addr_find.c index b187337d885..8dcad300ad8 100644 --- a/cmd/addr_find.c +++ b/cmd/addr_find.c @@ -8,7 +8,7 @@ #include <config.h> #include <command.h> #include <env.h> -#include <fs.h> +#include <fs_legacy.h> #include <lmb.h> #include <asm/global_data.h> diff --git a/cmd/btrfs.c b/cmd/btrfs.c index 69d1b1f830d..670aa958245 100644 --- a/cmd/btrfs.c +++ b/cmd/btrfs.c @@ -5,7 +5,7 @@ #include <command.h> #include <btrfs.h> -#include <fs.h> +#include <fs_legacy.h> int do_btrsubvol(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { diff --git a/cmd/cat.c b/cmd/cat.c index 24983cb9ca0..6272779b426 100644 --- a/cmd/cat.c +++ b/cmd/cat.c @@ -6,7 +6,7 @@ #include <abuf.h> #include <command.h> -#include <fs.h> +#include <fs_legacy.h> #include <malloc.h> #include <mapmem.h> diff --git a/cmd/cedit.c b/cmd/cedit.c index 9c492d45171..6db5806e851 100644 --- a/cmd/cedit.c +++ b/cmd/cedit.c @@ -11,7 +11,7 @@ #include <command.h> #include <dm.h> #include <expo.h> -#include <fs.h> +#include <fs_legacy.h> #include <malloc.h> #include <mapmem.h> #include <dm/ofnode.h> diff --git a/cmd/erofs.c b/cmd/erofs.c index add80b8b594..f4ff12eadaa 100644 --- a/cmd/erofs.c +++ b/cmd/erofs.c @@ -8,7 +8,7 @@ */ #include <command.h> -#include <fs.h> +#include <fs_legacy.h> #include <erofs.h> static int do_erofs_ls(struct cmd_tbl *cmdtp, int flag, int argc, char * const argv[]) diff --git a/cmd/ext2.c b/cmd/ext2.c index 45c8b353b58..3de098193e7 100644 --- a/cmd/ext2.c +++ b/cmd/ext2.c @@ -20,7 +20,7 @@ * Ext2fs support */ #include <command.h> -#include <fs.h> +#include <fs_legacy.h> static int do_ext2ls(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) diff --git a/cmd/ext4.c b/cmd/ext4.c index 40d1fe30d5e..02d3f7a174b 100644 --- a/cmd/ext4.c +++ b/cmd/ext4.c @@ -34,7 +34,7 @@ #include <ext4fs.h> #include <linux/stat.h> #include <malloc.h> -#include <fs.h> +#include <fs_legacy.h> #if defined(CONFIG_CMD_USB) && defined(CONFIG_USB_STORAGE) #include <usb.h> diff --git a/cmd/fat.c b/cmd/fat.c index 5b7484dc1af..aa01c36688b 100644 --- a/cmd/fat.c +++ b/cmd/fat.c @@ -10,7 +10,7 @@ #include <command.h> #include <mapmem.h> #include <fat.h> -#include <fs.h> +#include <fs_legacy.h> #include <part.h> #include <asm/cache.h> diff --git a/cmd/fpga.c b/cmd/fpga.c index 93f14098ccb..e6ae3856af8 100644 --- a/cmd/fpga.c +++ b/cmd/fpga.c @@ -10,7 +10,7 @@ #include <command.h> #include <env.h> #include <fpga.h> -#include <fs.h> +#include <fs_legacy.h> #include <gzip.h> #include <image.h> #include <log.h> diff --git a/cmd/fs.c b/cmd/fs.c index 7f1ab8f0fd2..51d587b8b16 100644 --- a/cmd/fs.c +++ b/cmd/fs.c @@ -6,7 +6,7 @@ */ #include <command.h> -#include <fs.h> +#include <fs_legacy.h> static int do_size_wrapper(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) diff --git a/cmd/fs_uuid.c b/cmd/fs_uuid.c index 5f7770d09ac..6a91c633dcb 100644 --- a/cmd/fs_uuid.c +++ b/cmd/fs_uuid.c @@ -6,7 +6,7 @@ */ #include <command.h> -#include <fs.h> +#include <fs_legacy.h> static int do_fs_uuid_wrapper(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) diff --git a/cmd/host.c b/cmd/host.c index e03576b4d2d..9832a88a5b0 100644 --- a/cmd/host.c +++ b/cmd/host.c @@ -5,7 +5,7 @@ #include <command.h> #include <dm.h> -#include <fs.h> +#include <fs_legacy.h> #include <part.h> #include <sandbox_host.h> #include <dm/device_compat.h> diff --git a/cmd/mvebu/bubt.c b/cmd/mvebu/bubt.c index 5e4ffc40d72..b64d5a5733c 100644 --- a/cmd/mvebu/bubt.c +++ b/cmd/mvebu/bubt.c @@ -20,7 +20,7 @@ #include <nand.h> #include <scsi.h> #include <usb.h> -#include <fs.h> +#include <fs_legacy.h> #include <mmc.h> #ifdef CONFIG_BLK #include <blk.h> diff --git a/cmd/pstore.c b/cmd/pstore.c index 9795eea2dbc..ab7ac656383 100644 --- a/cmd/pstore.c +++ b/cmd/pstore.c @@ -6,7 +6,7 @@ #include <config.h> #include <command.h> #include <fdtdec.h> -#include <fs.h> +#include <fs_legacy.h> #include <log.h> #include <mapmem.h> #include <memalign.h> diff --git a/cmd/pxe.c b/cmd/pxe.c index 7c9ffd87522..b5f2ff7cb6b 100644 --- a/cmd/pxe.c +++ b/cmd/pxe.c @@ -5,7 +5,7 @@ */ #include <command.h> -#include <fs.h> +#include <fs_legacy.h> #include <net.h> #include <net6.h> #include <malloc.h> diff --git a/cmd/sqfs.c b/cmd/sqfs.c index 107038c4cf2..b10403c4379 100644 --- a/cmd/sqfs.c +++ b/cmd/sqfs.c @@ -8,7 +8,7 @@ */ #include <command.h> -#include <fs.h> +#include <fs_legacy.h> #include <squashfs.h> static int do_sqfs_ls(struct cmd_tbl *cmdtp, int flag, int argc, char * const argv[]) diff --git a/cmd/sysboot.c b/cmd/sysboot.c index 384d5e15e3d..735c90fa42c 100644 --- a/cmd/sysboot.c +++ b/cmd/sysboot.c @@ -2,7 +2,7 @@ #include <command.h> #include <env.h> -#include <fs.h> +#include <fs_legacy.h> #include <pxe_utils.h> #include <vsprintf.h> diff --git a/cmd/test.c b/cmd/test.c index b4c3eabf9f6..cb24479f5b1 100644 --- a/cmd/test.c +++ b/cmd/test.c @@ -5,7 +5,7 @@ */ #include <command.h> -#include <fs.h> +#include <fs_legacy.h> #include <log.h> #include <vsprintf.h> diff --git a/cmd/xxd.c b/cmd/xxd.c index 8ae05f910cb..f1294d763b1 100644 --- a/cmd/xxd.c +++ b/cmd/xxd.c @@ -6,7 +6,7 @@ #include <command.h> #include <display_options.h> -#include <fs.h> +#include <fs_legacy.h> #include <malloc.h> #include <mapmem.h> diff --git a/common/board_f.c b/common/board_f.c index 29af0f1c58c..3a4fb9a42ef 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -23,7 +23,7 @@ #include <env_internal.h> #include <event.h> #include <fdtdec.h> -#include <fs.h> +#include <fs_legacy.h> #include <hang.h> #include <i2c.h> #include <init.h> diff --git a/common/spl/spl_blk_fs.c b/common/spl/spl_blk_fs.c index bbf90a9741e..aa2a031d169 100644 --- a/common/spl/spl_blk_fs.c +++ b/common/spl/spl_blk_fs.c @@ -8,7 +8,7 @@ #include <spl.h> #include <spl_load.h> #include <image.h> -#include <fs.h> +#include <fs_legacy.h> #include <asm/cache.h> #include <asm/io.h> diff --git a/common/splash_source.c b/common/splash_source.c index 2df78a4f2d7..f6b51aab017 100644 --- a/common/splash_source.c +++ b/common/splash_source.c @@ -9,7 +9,7 @@ #include <command.h> #include <env.h> #include <errno.h> -#include <fs.h> +#include <fs_legacy.h> #include <fdt_support.h> #include <image.h> #include <log.h> diff --git a/drivers/bootcount/bootcount_fs.c b/drivers/bootcount/bootcount_fs.c index 569592d8aad..f8e1478b7b7 100644 --- a/drivers/bootcount/bootcount_fs.c +++ b/drivers/bootcount/bootcount_fs.c @@ -4,7 +4,7 @@ */ #include <bootcount.h> -#include <fs.h> +#include <fs_legacy.h> #include <mapmem.h> #define BC_MAGIC 0xbd diff --git a/drivers/fastboot/fb_getvar.c b/drivers/fastboot/fb_getvar.c index 93cbd598e02..610d359aed3 100644 --- a/drivers/fastboot/fb_getvar.c +++ b/drivers/fastboot/fb_getvar.c @@ -8,7 +8,7 @@ #include <fastboot-internal.h> #include <fb_mmc.h> #include <fb_nand.h> -#include <fs.h> +#include <fs_legacy.h> #include <part.h> #include <version.h> #include <vsprintf.h> diff --git a/drivers/fpga/zynqpl.c b/drivers/fpga/zynqpl.c index 3e86d854a01..0a87eb7917a 100644 --- a/drivers/fpga/zynqpl.c +++ b/drivers/fpga/zynqpl.c @@ -13,7 +13,7 @@ #include <time.h> #include <asm/cache.h> #include <asm/io.h> -#include <fs.h> +#include <fs_legacy.h> #include <zynqpl.h> #include <linux/delay.h> #include <linux/sizes.h> diff --git a/drivers/misc/fs_loader.c b/drivers/misc/fs_loader.c index 66803f4b997..cf253c9864e 100644 --- a/drivers/misc/fs_loader.c +++ b/drivers/misc/fs_loader.c @@ -10,7 +10,7 @@ #include <env.h> #include <errno.h> #include <blk.h> -#include <fs.h> +#include <fs_legacy.h> #include <fs_loader.h> #include <log.h> #include <asm/global_data.h> diff --git a/drivers/net/phy/aquantia.c b/drivers/net/phy/aquantia.c index d2db8d9f792..5af993a6898 100644 --- a/drivers/net/phy/aquantia.c +++ b/drivers/net/phy/aquantia.c @@ -15,7 +15,7 @@ #include <u-boot/crc.h> #include <malloc.h> #include <asm/byteorder.h> -#include <fs.h> +#include <fs_legacy.h> #define AQUNTIA_10G_CTL 0x20 #define AQUNTIA_VENDOR_P1 0xc400 diff --git a/drivers/remoteproc/ipu_rproc.c b/drivers/remoteproc/ipu_rproc.c index 2ca78b550a7..345772b7af2 100644 --- a/drivers/remoteproc/ipu_rproc.c +++ b/drivers/remoteproc/ipu_rproc.c @@ -26,7 +26,7 @@ #include <misc.h> #include <power-domain.h> #include <timer.h> -#include <fs.h> +#include <fs_legacy.h> #include <spl.h> #include <timer.h> #include <reset.h> diff --git a/fs/erofs/erofs_fs.h b/fs/erofs/erofs_fs.h index 5bac4fe1a1d..b8da9abe683 100644 --- a/fs/erofs/erofs_fs.h +++ b/fs/erofs/erofs_fs.h @@ -10,7 +10,7 @@ #define __EROFS_FS_H #include <asm/unaligned.h> -#include <fs.h> +#include <fs_legacy.h> #include <part.h> #include <stdint.h> #include <compiler.h> diff --git a/fs/exfat/io.c b/fs/exfat/io.c index c56f5675987..c4cc778fb39 100644 --- a/fs/exfat/io.c +++ b/fs/exfat/io.c @@ -46,7 +46,7 @@ #include <ublio.h> #endif #else -#include <fs.h> +#include <fs_legacy.h> #include <fs_internal.h> static struct exfat_ctxt { diff --git a/fs/fat/fat.c b/fs/fat/fat.c index e2570e81676..0cbfdf49a32 100644 --- a/fs/fat/fat.c +++ b/fs/fat/fat.c @@ -14,7 +14,7 @@ #include <config.h> #include <exports.h> #include <fat.h> -#include <fs.h> +#include <fs_legacy.h> #include <log.h> #include <asm/byteorder.h> #include <asm/unaligned.h> diff --git a/fs/fs.c b/fs/fs.c index 63ed6436493..5be041e2133 100644 --- a/fs/fs.c +++ b/fs/fs.c @@ -19,7 +19,7 @@ #include <part.h> #include <ext4fs.h> #include <fat.h> -#include <fs.h> +#include <fs_legacy.h> #include <sandboxfs.h> #include <semihostingfs.h> #include <time.h> diff --git a/fs/sandbox/hostfs_bootdev.c b/fs/sandbox/hostfs_bootdev.c index 08dafafcef0..09f8372194c 100644 --- a/fs/sandbox/hostfs_bootdev.c +++ b/fs/sandbox/hostfs_bootdev.c @@ -10,7 +10,7 @@ #include <bootflow.h> #include <bootmeth.h> #include <dm.h> -#include <fs.h> +#include <fs_legacy.h> static int host_get_bootflow(struct udevice *dev, struct bootflow_iter *iter, struct bootflow *bflow) diff --git a/fs/sandbox/sandboxfs.c b/fs/sandbox/sandboxfs.c index 76f1a71f412..bfb30ef47fe 100644 --- a/fs/sandbox/sandboxfs.c +++ b/fs/sandbox/sandboxfs.c @@ -4,7 +4,7 @@ */ #include <stdio.h> -#include <fs.h> +#include <fs_legacy.h> #include <malloc.h> #include <os.h> #include <sandboxfs.h> diff --git a/fs/semihostingfs.c b/fs/semihostingfs.c index 77e39ca407e..939ca290e3b 100644 --- a/fs/semihostingfs.c +++ b/fs/semihostingfs.c @@ -5,7 +5,7 @@ */ #include <stdio.h> -#include <fs.h> +#include <fs_legacy.h> #include <malloc.h> #include <os.h> #include <semihosting.h> diff --git a/fs/squashfs/sqfs.c b/fs/squashfs/sqfs.c index b9314019b1b..182968ac6ce 100644 --- a/fs/squashfs/sqfs.c +++ b/fs/squashfs/sqfs.c @@ -10,7 +10,7 @@ #include <asm/unaligned.h> #include <div64.h> #include <errno.h> -#include <fs.h> +#include <fs_legacy.h> #include <linux/types.h> #include <asm/byteorder.h> #include <linux/compat.h> diff --git a/fs/squashfs/sqfs_filesystem.h b/fs/squashfs/sqfs_filesystem.h index be56498a5e3..32425b0ff29 100644 --- a/fs/squashfs/sqfs_filesystem.h +++ b/fs/squashfs/sqfs_filesystem.h @@ -9,7 +9,7 @@ #define SQFS_FILESYSTEM_H #include <asm/unaligned.h> -#include <fs.h> +#include <fs_legacy.h> #include <part.h> #include <stdint.h> diff --git a/include/ext4fs.h b/include/ext4fs.h index fe3fb301ec8..5822da38545 100644 --- a/include/ext4fs.h +++ b/include/ext4fs.h @@ -27,7 +27,7 @@ #ifndef __EXT4__ #define __EXT4__ #include <ext_common.h> -#include <fs.h> +#include <fs_legacy.h> struct disk_partition; diff --git a/include/fat.h b/include/fat.h index ca97880de12..053c34dd0e2 100644 --- a/include/fat.h +++ b/include/fat.h @@ -9,7 +9,7 @@ #ifndef _FAT_H_ #define _FAT_H_ -#include <fs.h> +#include <fs_legacy.h> #include <asm/byteorder.h> #include <asm/cache.h> diff --git a/include/fs.h b/include/fs_legacy.h similarity index 100% rename from include/fs.h rename to include/fs_legacy.h diff --git a/lib/efi_loader/efi_capsule.c b/lib/efi_loader/efi_capsule.c index 14faf9848e6..9972214b0fa 100644 --- a/lib/efi_loader/efi_capsule.c +++ b/lib/efi_loader/efi_capsule.c @@ -13,7 +13,7 @@ #include <efi_variable.h> #include <env.h> #include <fdtdec.h> -#include <fs.h> +#include <fs_legacy.h> #include <fwu.h> #include <hang.h> #include <malloc.h> diff --git a/lib/efi_loader/efi_disk.c b/lib/efi_loader/efi_disk.c index 47b583cc5e1..83f70bc2157 100644 --- a/lib/efi_loader/efi_disk.c +++ b/lib/efi_loader/efi_disk.c @@ -15,7 +15,7 @@ #include <event.h> #include <efi_driver.h> #include <efi_loader.h> -#include <fs.h> +#include <fs_legacy.h> #include <log.h> #include <part.h> #include <malloc.h> diff --git a/lib/efi_loader/efi_file.c b/lib/efi_loader/efi_file.c index 7d81da8f2d8..65bc99b961b 100644 --- a/lib/efi_loader/efi_file.c +++ b/lib/efi_loader/efi_file.c @@ -12,7 +12,7 @@ #include <log.h> #include <malloc.h> #include <mapmem.h> -#include <fs.h> +#include <fs_legacy.h> #include <part.h> /* GUID for file system information */ diff --git a/lib/efi_loader/efi_helper.c b/lib/efi_loader/efi_helper.c index 9d73200e604..82e0fd7b069 100644 --- a/lib/efi_loader/efi_helper.c +++ b/lib/efi_loader/efi_helper.c @@ -13,7 +13,7 @@ #include <malloc.h> #include <mapmem.h> #include <dm.h> -#include <fs.h> +#include <fs_legacy.h> #include <efi.h> #include <efi_api.h> #include <efi_load_initrd.h> diff --git a/lib/efi_loader/efi_load_initrd.c b/lib/efi_loader/efi_load_initrd.c index b5d58943a80..a6d14eb5f74 100644 --- a/lib/efi_loader/efi_load_initrd.c +++ b/lib/efi_loader/efi_load_initrd.c @@ -8,7 +8,7 @@ #include <efi_loader.h> #include <efi_load_initrd.h> #include <efi_variable.h> -#include <fs.h> +#include <fs_legacy.h> #include <malloc.h> #include <mapmem.h> diff --git a/lib/efi_loader/efi_var_file.c b/lib/efi_loader/efi_var_file.c index ba0bf33ffbd..f3f034dde48 100644 --- a/lib/efi_loader/efi_var_file.c +++ b/lib/efi_loader/efi_var_file.c @@ -8,7 +8,7 @@ #define LOG_CATEGORY LOGC_EFI #include <charset.h> -#include <fs.h> +#include <fs_legacy.h> #include <log.h> #include <malloc.h> #include <mapmem.h> diff --git a/test/dm/host.c b/test/dm/host.c index f577377da6a..a126cc9b3a5 100644 --- a/test/dm/host.c +++ b/test/dm/host.c @@ -6,7 +6,7 @@ #include <blk.h> #include <dm.h> -#include <fs.h> +#include <fs_legacy.h> #include <os.h> #include <sandbox_host.h> #include <asm/test.h> diff --git a/test/dm/rkmtd.c b/test/dm/rkmtd.c index d1ca5d1acac..06e314647e8 100644 --- a/test/dm/rkmtd.c +++ b/test/dm/rkmtd.c @@ -10,7 +10,7 @@ #include <blk.h> #include <dm.h> -#include <fs.h> +#include <fs_legacy.h> #include <rkmtd.h> #include <asm/test.h> #include <dm/device-internal.h> diff --git a/test/image/spl_load_fs.c b/test/image/spl_load_fs.c index 935078bf67b..4663729f58c 100644 --- a/test/image/spl_load_fs.c +++ b/test/image/spl_load_fs.c @@ -7,7 +7,7 @@ #include <ext_common.h> #include <ext4fs.h> #include <fat.h> -#include <fs.h> +#include <fs_legacy.h> #include <memalign.h> #include <spl.h> #include <asm/io.h> -- 2.43.0