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

[Tom Rini <trini@konsulko.com>]

On Wed, Aug 12, 2015 at 07:31:55AM +0900, Masahiro Yamada 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@socionext.com>
> Reviewed-by: Tom Rini <trini@konsulko.com>
> Reviewed-by: Simon Glass <sjg@chromium.org>
> Acked-by: Linus Walleij <linus.walleij@linaro.org>

(With a slight change due to samsun PR, but applied cleanly after
rename)
Applied to u-boot/master, thanks!

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20150818/f0eaf6b7/attachment.sig>