* [U-Boot] [PATCH] SPL: ext: remove redundant ifdef statement
@ 2016-06-14 10:06 Petr Kulhavy
2016-06-17 12:07 ` Guillaume Gardet
2016-06-19 14:12 ` [U-Boot] " Tom Rini
0 siblings, 2 replies; 3+ messages in thread
From: Petr Kulhavy @ 2016-06-14 10:06 UTC (permalink / raw)
To: u-boot
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(-)
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);
--
2.5.0
^ permalink raw reply related [flat|nested] 3+ messages in thread* [U-Boot] [PATCH] SPL: ext: remove redundant ifdef statement
2016-06-14 10:06 [U-Boot] [PATCH] SPL: ext: remove redundant ifdef statement Petr Kulhavy
@ 2016-06-17 12:07 ` Guillaume Gardet
2016-06-19 14:12 ` [U-Boot] " Tom Rini
1 sibling, 0 replies; 3+ messages in thread
From: Guillaume Gardet @ 2016-06-17 12:07 UTC (permalink / raw)
To: u-boot
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);
^ permalink raw reply [flat|nested] 3+ messages in thread* [U-Boot] SPL: ext: remove redundant ifdef statement
2016-06-14 10:06 [U-Boot] [PATCH] SPL: ext: remove redundant ifdef statement Petr Kulhavy
2016-06-17 12:07 ` Guillaume Gardet
@ 2016-06-19 14:12 ` Tom Rini
1 sibling, 0 replies; 3+ messages in thread
From: Tom Rini @ 2016-06-19 14:12 UTC (permalink / raw)
To: u-boot
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!
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160619/77250777/attachment.sig>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-06-19 14:12 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-06-14 10:06 [U-Boot] [PATCH] SPL: ext: remove redundant ifdef statement Petr Kulhavy
2016-06-17 12:07 ` Guillaume Gardet
2016-06-19 14:12 ` [U-Boot] " Tom Rini
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox