diff options
| author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2015-08-12 07:31:55 +0900 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-08-18 13:46:05 -0400 |
| commit | 0f9258228e2b2070368ffccf5c243218128770a8 (patch) | |
| tree | cb0d5f4b6d223e2a20a4d3f300ea1f266a4e6a40 /arch/arm/mach-tegra/tegra114 | |
| parent | dffb86e468c8e02ba77283989aefef214d904dc5 (diff) | |
| download | talos-obmc-uboot-0f9258228e2b2070368ffccf5c243218128770a8.tar.gz talos-obmc-uboot-0f9258228e2b2070368ffccf5c243218128770a8.zip | |
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 'arch/arm/mach-tegra/tegra114')
| -rw-r--r-- | arch/arm/mach-tegra/tegra114/clock.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-tegra/tegra114/clock.c b/arch/arm/mach-tegra/tegra114/clock.c index f1831d385d..5e805a7baf 100644 --- a/arch/arm/mach-tegra/tegra114/clock.c +++ b/arch/arm/mach-tegra/tegra114/clock.c @@ -582,7 +582,7 @@ void reset_set_enable(enum periph_id periph_id, int enable) writel(reg, reset); } -#ifdef CONFIG_OF_CONTROL +#if CONFIG_IS_ENABLED(OF_CONTROL) /* * Convert a device tree clock ID to our peripheral ID. They are mostly * the same but we are very cautious so we check that a valid clock ID is @@ -618,7 +618,7 @@ enum periph_id clk_id_to_periph_id(int clk_id) return clk_id; } } -#endif /* CONFIG_OF_CONTROL */ +#endif /* CONFIG_IS_ENABLED(OF_CONTROL) */ void clock_early_init(void) { |
