diff options
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/Makefile | 2 | ||||
| -rw-r--r-- | fs/fat/Makefile | 4 | ||||
| -rw-r--r-- | fs/fs.c | 6 | ||||
| -rw-r--r-- | fs/sandbox/Makefile | 2 | ||||
| -rw-r--r-- | fs/squashfs/Makefile | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/fs/Makefile b/fs/Makefile index a3ee0a3..1e54ac1 100644 --- a/fs/Makefile +++ b/fs/Makefile @@ -4,7 +4,7 @@ # Wolfgang Denk, DENX Software Engineering, wd@denx.de. # Copyright (c) 2012, NVIDIA CORPORATION. All rights reserved. -ifdef CONFIG_SPL_BUILD +ifdef CONFIG_XPL_BUILD obj-$(CONFIG_SPL_FS_LOADER) += fs.o obj-$(CONFIG_SPL_FS_FAT) += fat/ obj-$(CONFIG_SPL_FS_EXT4) += ext4/ diff --git a/fs/fat/Makefile b/fs/fat/Makefile index f84efac..7414b36 100644 --- a/fs/fat/Makefile +++ b/fs/fat/Makefile @@ -1,5 +1,5 @@ # SPDX-License-Identifier: GPL-2.0+ # -obj-$(CONFIG_$(SPL_)FS_FAT) = fat.o -obj-$(CONFIG_$(SPL_)FAT_WRITE) = fat_write.o +obj-$(CONFIG_$(XPL_)FS_FAT) = fat.o +obj-$(CONFIG_$(XPL_)FAT_WRITE) = fat_write.o @@ -237,7 +237,7 @@ static struct fstype_info fstypes[] = { .mkdir = fs_mkdir_unsupported, }, #endif -#if IS_ENABLED(CONFIG_SANDBOX) && !IS_ENABLED(CONFIG_SPL_BUILD) +#if IS_ENABLED(CONFIG_SANDBOX) && !IS_ENABLED(CONFIG_XPL_BUILD) { .fstype = FS_TYPE_SANDBOX, .name = "sandbox", @@ -275,7 +275,7 @@ static struct fstype_info fstypes[] = { .ln = fs_ln_unsupported, }, #endif -#ifndef CONFIG_SPL_BUILD +#ifndef CONFIG_XPL_BUILD #ifdef CONFIG_CMD_UBIFS { .fstype = FS_TYPE_UBIFS, @@ -296,7 +296,7 @@ static struct fstype_info fstypes[] = { }, #endif #endif -#ifndef CONFIG_SPL_BUILD +#ifndef CONFIG_XPL_BUILD #ifdef CONFIG_FS_BTRFS { .fstype = FS_TYPE_BTRFS, diff --git a/fs/sandbox/Makefile b/fs/sandbox/Makefile index 880d59d..54ad842 100644 --- a/fs/sandbox/Makefile +++ b/fs/sandbox/Makefile @@ -9,4 +9,4 @@ # Pavel Bartusek, Sysgo Real-Time Solutions AG, pba@sysgo.de obj-y := sandboxfs.o -obj-$(CONFIG_$(SPL_TPL_)BOOTSTD) += host_bootdev.o +obj-$(CONFIG_$(PHASE_)BOOTSTD) += host_bootdev.o diff --git a/fs/squashfs/Makefile b/fs/squashfs/Makefile index ba66ee8..0772e1a 100644 --- a/fs/squashfs/Makefile +++ b/fs/squashfs/Makefile @@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0+ # -obj-$(CONFIG_$(SPL_)FS_SQUASHFS) = sqfs.o \ +obj-$(CONFIG_$(XPL_)FS_SQUASHFS) = sqfs.o \ sqfs_inode.o \ sqfs_dir.o \ sqfs_decompressor.o |