diff options
| author | Tom Rini <trini@ti.com> | 2014-05-09 11:18:45 -0400 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-05-09 11:18:45 -0400 |
| commit | bcb879c0e37db1cf527ff408df93918f155012ea (patch) | |
| tree | c092b7e27e69b3c419b6cd238768ceb73f793644 /common/spl/spl_fat.c | |
| parent | 146b468eb0203c9b1aa1de93723ffc82c85d1dc1 (diff) | |
| parent | d2a3e911390f9fc4d8c0ee4b3c7fc75f4fd3fd19 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'common/spl/spl_fat.c')
| -rw-r--r-- | common/spl/spl_fat.c | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/common/spl/spl_fat.c b/common/spl/spl_fat.c index 1e532d5963e..56be9438814 100644 --- a/common/spl/spl_fat.c +++ b/common/spl/spl_fat.c @@ -74,11 +74,38 @@ end: int spl_load_image_fat_os(block_dev_desc_t *block_dev, int partition) { int err; + __maybe_unused char *file; err = spl_register_fat_device(block_dev, partition); if (err) return err; +#if defined(CONFIG_SPL_ENV_SUPPORT) && defined(CONFIG_SPL_OS_BOOT) + file = getenv("falcon_args_file"); + if (file) { + err = file_fat_read(file, (void *)CONFIG_SYS_SPL_ARGS_ADDR, 0); + if (err <= 0) { + printf("spl: error reading image %s, err - %d, falling back to default\n", + file, err); + goto defaults; + } + file = getenv("falcon_image_file"); + if (file) { + err = spl_load_image_fat(block_dev, partition, file); + if (err != 0) { + puts("spl: falling back to default\n"); + goto defaults; + } + + return 0; + } else + puts("spl: falcon_image_file not set in environment, falling back to default\n"); + } else + puts("spl: falcon_args_file not set in environment, falling back to default\n"); + +defaults: +#endif + err = file_fat_read(CONFIG_SPL_FAT_LOAD_ARGS_NAME, (void *)CONFIG_SYS_SPL_ARGS_ADDR, 0); if (err <= 0) { |