[PATCH 2/6] board_r: env: Use IS_ENABLED() instead of #ifdefs

[Ovidiu Panait]

Use IS_ENABLED() instead of #ifdef in should_load_env and initr_env
functions.

No functional change intended.

Signed-off-by: Ovidiu Panait <ovidiu.pan...@windriver.com>
---
 common/board_r.c | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/common/board_r.c b/common/board_r.c
index d9015cd057..f6770f2300 100644
--- a/common/board_r.c
+++ b/common/board_r.c
@@ -464,13 +464,14 @@ static int initr_mmc(void)
  */
 static int should_load_env(void)
 {
-#ifdef CONFIG_OF_CONTROL
-       return fdtdec_get_config_int(gd->fdt_blob, "load-environment", 1);
-#elif defined CONFIG_DELAY_ENVIRONMENT
-       return 0;
-#else
+       if (IS_ENABLED(CONFIG_OF_CONTROL))
+               return fdtdec_get_config_int(gd->fdt_blob,
+                                               "load-environment", 1);
+
+       if (IS_ENABLED(CONFIG_DELAY_ENVIRONMENT))
+               return 0;
+
        return 1;
-#endif
 }
 
 static int initr_env(void)
@@ -480,10 +481,10 @@ static int initr_env(void)
                env_relocate();
        else
                env_set_default(NULL, 0);
-#ifdef CONFIG_OF_CONTROL
-       env_set_hex("fdtcontroladdr",
-                   (unsigned long)map_to_sysmem(gd->fdt_blob));
-#endif
+
+       if (IS_ENABLED(CONFIG_OF_CONTROL))
+               env_set_hex("fdtcontroladdr",
+                           (unsigned long)map_to_sysmem(gd->fdt_blob));
 
        /* Initialize from environment */
        image_load_addr = env_get_ulong("loadaddr", 16, image_load_addr);
-- 
2.17.1