| Message ID | 1465898796-22329-1-git-send-email-brain@jikos.cz |
|---|---|
| State | Accepted |
| Commit | 58c95d5356f4a4c711523dbca0e989cfc8d2cf21 |
| Delegated to: | Tom Rini |
| Headers | show |
Le 14/06/2016 12:06, Petr Kulhavy a écrit : > 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> > --- > common/spl/spl_ext.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/common/spl/spl_ext.c b/common/spl/spl_ext.c > index 074b31e..9a230d5 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);
On Tue, Jun 14, 2016 at 12:06:36PM +0200, Petr Kulhavy wrote: > 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> Applied to u-boot/master, thanks!
diff --git a/common/spl/spl_ext.c b/common/spl/spl_ext.c index 074b31e..9a230d5 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);
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> --- common/spl/spl_ext.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)