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

Masahiro Yamada
2015-08-17T03:09:26Z

2015-08-12 7:31 GMT+09:00 Masahiro Yamada <yamada.masahiro@socionext.com>:
> 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@socionext.com>
> Reviewed-by: Tom Rini <trini@konsulko.com>
> Reviewed-by: Simon Glass <sjg@chromium.org>

Linus replied to v2 which had been superseded.

So, moving his Acked-by over here.
Acked-by: Linus Walleij <linus.walleij@linaro.org>

Tom,

This patch does not apply to the current u-boot/master again.

Please let me know when you need v4.

--
Best Regards
Masahiro Yamada