diff options
| author | Guillaume GARDET <guillaume.gardet@free.fr> | 2014-10-15 17:53:11 +0200 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-10-27 11:04:01 -0400 |
| commit | 205b4f33cfe58268df7d433f2da515fe660afd9c (patch) | |
| tree | 8728a6a0ee5ed548920218ca3b4fb6d09021b7e5 /common | |
| parent | b01495e644db8315bd32b9e8d324487ef4f5b4f6 (diff) | |
| download | u-boot-205b4f33cfe58268df7d433f2da515fe660afd9c.tar.gz u-boot-205b4f33cfe58268df7d433f2da515fe660afd9c.tar.xz u-boot-205b4f33cfe58268df7d433f2da515fe660afd9c.zip | |
Rename some defines containing FAT in their name to be filesystem generic
Rename some defines containing FAT in their name to be filesystem generic:
MMCSD_MODE_FAT => MMCSD_MODE_FS
CONFIG_SPL_FAT_LOAD_ARGS_NAME => CONFIG_SPL_FS_LOAD_ARGS_NAME
CONFIG_SPL_FAT_LOAD_PAYLOAD_NAME => CONFIG_SPL_FS_LOAD_PAYLOAD_NAME
CONFIG_SYS_MMC_SD_FAT_BOOT_PARTITION => CONFIG_SYS_MMC_SD_FS_BOOT_PARTITION
Signed-off-by: Guillaume GARDET <guillaume.gardet@free.fr>
Cc: Tom Rini <trini@ti.com>
Diffstat (limited to 'common')
| -rw-r--r-- | common/spl/spl_fat.c | 6 | ||||
| -rw-r--r-- | common/spl/spl_mmc.c | 8 | ||||
| -rw-r--r-- | common/spl/spl_sata.c | 2 | ||||
| -rw-r--r-- | common/spl/spl_usb.c | 2 |
4 files changed, 9 insertions, 9 deletions
diff --git a/common/spl/spl_fat.c b/common/spl/spl_fat.c index 56be943881..91481fcc13 100644 --- a/common/spl/spl_fat.c +++ b/common/spl/spl_fat.c @@ -106,18 +106,18 @@ int spl_load_image_fat_os(block_dev_desc_t *block_dev, int partition) defaults: #endif - err = file_fat_read(CONFIG_SPL_FAT_LOAD_ARGS_NAME, + err = file_fat_read(CONFIG_SPL_FS_LOAD_ARGS_NAME, (void *)CONFIG_SYS_SPL_ARGS_ADDR, 0); if (err <= 0) { #ifdef CONFIG_SPL_LIBCOMMON_SUPPORT printf("%s: error reading image %s, err - %d\n", - __func__, CONFIG_SPL_FAT_LOAD_ARGS_NAME, err); + __func__, CONFIG_SPL_FS_LOAD_ARGS_NAME, err); #endif return -1; } return spl_load_image_fat(block_dev, partition, - CONFIG_SPL_FAT_LOAD_KERNEL_NAME); + CONFIG_SPL_FS_LOAD_KERNEL_NAME); } #endif #endif diff --git a/common/spl/spl_mmc.c b/common/spl/spl_mmc.c index fa6f891bc8..a631e0abf6 100644 --- a/common/spl/spl_mmc.c +++ b/common/spl/spl_mmc.c @@ -101,15 +101,15 @@ void spl_mmc_load_image(void) err = mmc_load_image_raw(mmc, CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR); #ifdef CONFIG_SPL_FAT_SUPPORT - } else if (boot_mode == MMCSD_MODE_FAT) { + } else if (boot_mode == MMCSD_MODE_FS) { debug("boot mode - FAT\n"); #ifdef CONFIG_SPL_OS_BOOT if (spl_start_uboot() || spl_load_image_fat_os(&mmc->block_dev, - CONFIG_SYS_MMC_SD_FAT_BOOT_PARTITION)) + CONFIG_SYS_MMC_SD_FS_BOOT_PARTITION)) #endif err = spl_load_image_fat(&mmc->block_dev, - CONFIG_SYS_MMC_SD_FAT_BOOT_PARTITION, - CONFIG_SPL_FAT_LOAD_PAYLOAD_NAME); + CONFIG_SYS_MMC_SD_FS_BOOT_PARTITION, + CONFIG_SPL_FS_LOAD_PAYLOAD_NAME); #endif #ifdef CONFIG_SUPPORT_EMMC_BOOT } else if (boot_mode == MMCSD_MODE_EMMCBOOT) { diff --git a/common/spl/spl_sata.c b/common/spl/spl_sata.c index 12e16d9603..aeea79315e 100644 --- a/common/spl/spl_sata.c +++ b/common/spl/spl_sata.c @@ -42,7 +42,7 @@ void spl_sata_load_image(void) #endif err = spl_load_image_fat(stor_dev, CONFIG_SYS_SATA_FAT_BOOT_PARTITION, - CONFIG_SPL_FAT_LOAD_PAYLOAD_NAME); + CONFIG_SPL_FS_LOAD_PAYLOAD_NAME); if (err) { puts("Error loading sata device\n"); hang(); diff --git a/common/spl/spl_usb.c b/common/spl/spl_usb.c index 53a9043795..c81672b798 100644 --- a/common/spl/spl_usb.c +++ b/common/spl/spl_usb.c @@ -49,7 +49,7 @@ void spl_usb_load_image(void) #endif err = spl_load_image_fat(stor_dev, CONFIG_SYS_USB_FAT_BOOT_PARTITION, - CONFIG_SPL_FAT_LOAD_PAYLOAD_NAME); + CONFIG_SPL_FS_LOAD_PAYLOAD_NAME); if (err) { puts("Error loading USB device\n"); |