mirror of
https://github.com/brain-hackers/u-boot-brain
synced 2024-07-11 13:46:17 +09:00
0f9258228e
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>
16 lines
393 B
Makefile
16 lines
393 B
Makefile
#
|
|
# Copyright (c) 2013 Google, Inc
|
|
#
|
|
# SPDX-License-Identifier: GPL-2.0+
|
|
#
|
|
|
|
obj-y += device.o lists.o root.o uclass.o util.o
|
|
obj-$(CONFIG_DEVRES) += devres.o
|
|
ifndef CONFIG_SPL_BUILD
|
|
obj-$(CONFIG_$(SPL_)OF_CONTROL) += simple-bus.o
|
|
endif
|
|
obj-$(CONFIG_$(SPL_)DM_DEVICE_REMOVE) += device-remove.o
|
|
obj-$(CONFIG_DM) += dump.o
|
|
obj-$(CONFIG_REGMAP) += regmap.o
|
|
obj-$(CONFIG_SYSCON) += syscon-uclass.o
|