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>
Showing
- arch/arm/mach-exynos/include/mach/dwmmc.h 0 additions, 2 deletionsarch/arm/mach-exynos/include/mach/dwmmc.h
- arch/arm/mach-exynos/include/mach/mipi_dsim.h 0 additions, 2 deletionsarch/arm/mach-exynos/include/mach/mipi_dsim.h
- arch/arm/mach-exynos/include/mach/mmc.h 0 additions, 2 deletionsarch/arm/mach-exynos/include/mach/mmc.h
- arch/arm/mach-exynos/pinmux.c 1 addition, 1 deletionarch/arm/mach-exynos/pinmux.c
- arch/arm/mach-tegra/clock.c 2 additions, 2 deletionsarch/arm/mach-tegra/clock.c
- arch/arm/mach-tegra/tegra114/clock.c 2 additions, 2 deletionsarch/arm/mach-tegra/tegra114/clock.c
- arch/arm/mach-tegra/tegra124/clock.c 2 additions, 2 deletionsarch/arm/mach-tegra/tegra124/clock.c
- arch/arm/mach-tegra/tegra20/clock.c 2 additions, 2 deletionsarch/arm/mach-tegra/tegra20/clock.c
- arch/arm/mach-tegra/tegra30/clock.c 2 additions, 2 deletionsarch/arm/mach-tegra/tegra30/clock.c
- board/xilinx/microblaze-generic/microblaze-generic.c 1 addition, 1 deletionboard/xilinx/microblaze-generic/microblaze-generic.c
- board/xilinx/zynq/board.c 1 addition, 1 deletionboard/xilinx/zynq/board.c
- common/cli.c 2 additions, 2 deletionscommon/cli.c
- common/spl/spl.c 1 addition, 2 deletionscommon/spl/spl.c
- drivers/core/Makefile 1 addition, 1 deletiondrivers/core/Makefile
- drivers/core/device.c 2 additions, 2 deletionsdrivers/core/device.c
- drivers/core/lists.c 1 addition, 1 deletiondrivers/core/lists.c
- drivers/core/root.c 3 additions, 3 deletionsdrivers/core/root.c
- drivers/gpio/mxc_gpio.c 1 addition, 1 deletiondrivers/gpio/mxc_gpio.c
- drivers/gpio/vybrid_gpio.c 1 addition, 1 deletiondrivers/gpio/vybrid_gpio.c
- drivers/i2c/s3c24x0_i2c.c 2 additions, 2 deletionsdrivers/i2c/s3c24x0_i2c.c
Loading
Please register or sign in to comment