diff options
author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2015-08-12 01:31:55 +0300 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2015-08-18 20:46:05 +0300 |
commit | 0f9258228e2b2070368ffccf5c243218128770a8 (patch) | |
tree | cb0d5f4b6d223e2a20a4d3f300ea1f266a4e6a40 /lib/fdtdec.c | |
parent | dffb86e468c8e02ba77283989aefef214d904dc5 (diff) | |
download | u-boot-0f9258228e2b2070368ffccf5c243218128770a8.tar.xz |
of: clean up OF_CONTROL ifdef conditionals
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>
Diffstat (limited to 'lib/fdtdec.c')
-rw-r--r-- | lib/fdtdec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/fdtdec.c b/lib/fdtdec.c index d21fb74c22..b65e1e6185 100644 --- a/lib/fdtdec.c +++ b/lib/fdtdec.c @@ -1140,7 +1140,7 @@ int fdtdec_decode_display_timing(const void *blob, int parent, int index, int fdtdec_setup(void) { -#ifdef CONFIG_OF_CONTROL +#if CONFIG_IS_ENABLED(OF_CONTROL) # ifdef CONFIG_OF_EMBED /* Get a pointer to the FDT */ gd->fdt_blob = __dtb_dt_begin; |