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-exynos | |
| parent | dffb86e468c8e02ba77283989aefef214d904dc5 (diff) | |
| download | blackbird-obmc-uboot-0f9258228e2b2070368ffccf5c243218128770a8.tar.gz blackbird-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-exynos')
| -rw-r--r-- | arch/arm/mach-exynos/include/mach/dwmmc.h | 2 | ||||
| -rw-r--r-- | arch/arm/mach-exynos/include/mach/mipi_dsim.h | 2 | ||||
| -rw-r--r-- | arch/arm/mach-exynos/include/mach/mmc.h | 2 | ||||
| -rw-r--r-- | arch/arm/mach-exynos/pinmux.c | 2 |
4 files changed, 1 insertions, 7 deletions
diff --git a/arch/arm/mach-exynos/include/mach/dwmmc.h b/arch/arm/mach-exynos/include/mach/dwmmc.h index a7ca12c477..bd997ad47e 100644 --- a/arch/arm/mach-exynos/include/mach/dwmmc.h +++ b/arch/arm/mach-exynos/include/mach/dwmmc.h @@ -27,7 +27,5 @@ #define DWMCI_DIVRATIO_BIT 24 #define DWMCI_DIVRATIO_MASK 0x7 -#ifdef CONFIG_OF_CONTROL int exynos_dwmmc_init(const void *blob); -#endif int exynos_dwmci_add_port(int index, u32 regbase, int bus_width, u32 clksel); diff --git a/arch/arm/mach-exynos/include/mach/mipi_dsim.h b/arch/arm/mach-exynos/include/mach/mipi_dsim.h index 50e5c258a9..c9e8e067d7 100644 --- a/arch/arm/mach-exynos/include/mach/mipi_dsim.h +++ b/arch/arm/mach-exynos/include/mach/mipi_dsim.h @@ -374,7 +374,5 @@ void exynos_init_dsim_platform_data(vidinfo_t *vid); /* panel driver init based on mipi dsi interface */ void s6e8ax0_init(void); -#ifdef CONFIG_OF_CONTROL extern int mipi_power(void); -#endif #endif /* _DSIM_H */ diff --git a/arch/arm/mach-exynos/include/mach/mmc.h b/arch/arm/mach-exynos/include/mach/mmc.h index 0fb6461c08..48b8c4d882 100644 --- a/arch/arm/mach-exynos/include/mach/mmc.h +++ b/arch/arm/mach-exynos/include/mach/mmc.h @@ -65,8 +65,6 @@ static inline int s5p_mmc_init(int index, int bus_width) return s5p_sdhci_init(base, index, bus_width); } -#ifdef CONFIG_OF_CONTROL int exynos_mmc_init(const void *blob); -#endif #endif diff --git a/arch/arm/mach-exynos/pinmux.c b/arch/arm/mach-exynos/pinmux.c index e97cb376ff..179b29449e 100644 --- a/arch/arm/mach-exynos/pinmux.c +++ b/arch/arm/mach-exynos/pinmux.c @@ -874,7 +874,7 @@ int exynos_pinmux_config(int peripheral, int flags) return -1; } -#ifdef CONFIG_OF_CONTROL +#if CONFIG_IS_ENABLED(OF_CONTROL) static int exynos4_pinmux_decode_periph_id(const void *blob, int node) { int err; |
