diff options
| author | Masahiro Yamada | 2015-08-12 07:31:55 +0900 |
|---|---|---|
| committer | Tom Rini | 2015-08-18 13:46:05 -0400 |
| commit | 0f9258228e2b2070368ffccf5c243218128770a8 (patch) | |
| tree | cb0d5f4b6d223e2a20a4d3f300ea1f266a4e6a40 /include/fdtdec.h | |
| parent | dffb86e468c8e02ba77283989aefef214d904dc5 (diff) | |
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 'include/fdtdec.h')
| -rw-r--r-- | include/fdtdec.h | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/include/fdtdec.h b/include/fdtdec.h index 5796e272b29..0cb6fa00750 100644 --- a/include/fdtdec.h +++ b/include/fdtdec.h @@ -45,16 +45,6 @@ struct fdt_memory { #define SPL_BUILD 0 #endif -#ifdef CONFIG_OF_CONTROL -# if defined(CONFIG_SPL_BUILD) && !defined(CONFIG_SPL_OF_CONTROL) -# define OF_CONTROL 0 -# else -# define OF_CONTROL 1 -# endif -#else -# define OF_CONTROL 0 -#endif - /* * Information about a resource. start is the first address of the resource * and end is the last address (inclusive). The length of the resource will |