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>
18 lines
455 B
Makefile
18 lines
455 B
Makefile
#
|
|
# (C) Copyright 2000-2007
|
|
# Wolfgang Denk, DENX Software Engineering, wd@denx.de.
|
|
#
|
|
# SPDX-License-Identifier: GPL-2.0+
|
|
#
|
|
|
|
obj-$(CONFIG_I8042_KBD) += i8042.o
|
|
obj-$(CONFIG_TEGRA_KEYBOARD) += tegra-kbc.o
|
|
obj-$(CONFIG_TWL4030_INPUT) += twl4030.o
|
|
obj-$(CONFIG_CROS_EC_KEYB) += cros_ec_keyb.o
|
|
ifdef CONFIG_PS2KBD
|
|
obj-y += keyboard.o pc_keyb.o
|
|
obj-$(CONFIG_PS2MULT) += ps2mult.o ps2ser.o
|
|
endif
|
|
obj-y += input.o
|
|
obj-$(CONFIG_$(SPL_)OF_CONTROL) += key_matrix.o
|