summaryrefslogtreecommitdiffstats
path: root/common
diff options
context:
space:
mode:
authorPetr Kulhavy <brain@jikos.cz>2016-06-14 12:06:36 +0200
committerTom Rini <trini@konsulko.com>2016-06-17 09:51:00 -0400
commit58c95d5356f4a4c711523dbca0e989cfc8d2cf21 (patch)
tree724ec14a5d67d83d408f0a6d3632f6027e6e930e /common
parente17adbb3507fc022fe6ed38b150ce9044101d9b0 (diff)
downloadtalos-obmc-uboot-58c95d5356f4a4c711523dbca0e989cfc8d2cf21.tar.gz
talos-obmc-uboot-58c95d5356f4a4c711523dbca0e989cfc8d2cf21.zip
SPL: ext: remove redundant ifdef statement
Remove redundant #if defined(CONFIG_SPL_OS_BOOT) statement around getenv() calls in spl_load_image_ext_os(). The whole function is surrounded by #ifdef CONFIG_SPL_OS_BOOT. No functional change. Signed-off-by: Petr Kulhavy <brain@jikos.cz> CC: Guillaume GARDET <guillaume.gardet@free.fr> Acked-by: Guillaume GARDET <guillaume.gardet@free.fr>
Diffstat (limited to 'common')
-rw-r--r--common/spl/spl_ext.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/common/spl/spl_ext.c b/common/spl/spl_ext.c
index ade5496600..89ac4f4297 100644
--- a/common/spl/spl_ext.c
+++ b/common/spl/spl_ext.c
@@ -88,8 +88,7 @@ int spl_load_image_ext_os(struct blk_desc *block_dev, int partition)
#endif
return -1;
}
-
-#if defined(CONFIG_SPL_ENV_SUPPORT) && defined(CONFIG_SPL_OS_BOOT)
+#if defined(CONFIG_SPL_ENV_SUPPORT)
file = getenv("falcon_args_file");
if (file) {
err = ext4fs_open(file, &filelen);
OpenPOWER on IntegriCloud