[U-Boot] [PATCH v2 15/15] of: clean up OF_CONTROL ifdef conditionals

[Linus Walleij]

On Sat, Aug 1, 2015 at 3:14 PM, Masahiro Yamada
<yamada.masahiro at socionext.com> wrote:

> We have flipped CONFIG_SPL_DISABLE_OF_CONTROL.  We have cleansing
> devices, $(SPL_) and CONFIG_IS_ENABLED(), so we are ready to clear
> away the ugly logic in include/fdtdec.h:
>
>  #ifdef CONFIG_OF_CONTROL
>  # if defined(CONFIG_SPL_BUILD) && !defined(SPL_OF_CONTROL)
>  #  define OF_CONTROL 0
>  # else
>  #  define OF_CONTROL 1
>  # endif
>  #else
>  # define OF_CONTROL 0
>  #endif
>
> Now CONFIG_IS_ENABLED(OF_CONTROL) is the substitute.  It refers to
> CONFIG_OF_CONTROL for U-boot proper and CONFIG_SPL_OF_CONTROL for
> SPL.
>
> Also, we no longer have to cancel CONFIG_OF_CONTROL in
> include/config_uncmd_spl.h and scripts/Makefile.spl.
>
> Signed-off-by: Masahiro Yamada <yamada.masahiro at socionext.com>

Acked-by: Linus Walleij <linus.walleij at linaro.org>

Yours,
Linus Walleij