]> git.sur5r.net Git - u-boot/commit
of: clean up OF_CONTROL ifdef conditionals
authorMasahiro Yamada <yamada.masahiro@socionext.com>
Tue, 11 Aug 2015 22:31:55 +0000 (07:31 +0900)
committerTom Rini <trini@konsulko.com>
Tue, 18 Aug 2015 17:46:05 +0000 (13:46 -0400)
commit0f9258228e2b2070368ffccf5c243218128770a8
treecb0d5f4b6d223e2a20a4d3f300ea1f266a4e6a40
parentdffb86e468c8e02ba77283989aefef214d904dc5
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>
55 files changed:
arch/arm/mach-exynos/include/mach/dwmmc.h
arch/arm/mach-exynos/include/mach/mipi_dsim.h
arch/arm/mach-exynos/include/mach/mmc.h
arch/arm/mach-exynos/pinmux.c
arch/arm/mach-tegra/clock.c
arch/arm/mach-tegra/tegra114/clock.c
arch/arm/mach-tegra/tegra124/clock.c
arch/arm/mach-tegra/tegra20/clock.c
arch/arm/mach-tegra/tegra30/clock.c
board/xilinx/microblaze-generic/microblaze-generic.c
board/xilinx/zynq/board.c
common/cli.c
common/spl/spl.c
drivers/core/Makefile
drivers/core/device.c
drivers/core/lists.c
drivers/core/root.c
drivers/gpio/mxc_gpio.c
drivers/gpio/vybrid_gpio.c
drivers/i2c/s3c24x0_i2c.c
drivers/input/Makefile
drivers/input/tegra-kbc.c
drivers/mmc/exynos_dw_mmc.c
drivers/mmc/s5p_sdhci.c
drivers/mmc/tegra_mmc.c
drivers/mmc/zynq_sdhci.c
drivers/mtd/spi/sf_probe.c
drivers/net/xilinx_emaclite.c
drivers/net/zynq_gem.c
drivers/power/exynos-tmu.c
drivers/power/pmic/pmic_max77686.c
drivers/serial/ns16550.c
drivers/serial/serial-uclass.c
drivers/serial/serial_omap.c
drivers/serial/serial_pl01x.c
drivers/serial/serial_tegra.c
drivers/serial/serial_uniphier.c
drivers/serial/serial_zynq.c
drivers/sound/max98095.c
drivers/sound/wm8994.c
drivers/tpm/tpm_tis_i2c.c
drivers/video/exynos_dp_lowlevel.c
drivers/video/exynos_fb.c
drivers/video/exynos_fimd.c
drivers/video/exynos_mipi_dsi.c
drivers/video/tegra.c
include/cli.h
include/config_uncmd_spl.h
include/configs/microblaze-generic.h
include/configs/socfpga_common.h
include/dm/device.h
include/fdtdec.h
lib/Makefile
lib/fdtdec.c
scripts/Makefile.uncmd_spl