summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.masahiro@socionext.com>2015-08-12 07:31:55 +0900
committerTom Rini <trini@konsulko.com>2015-08-18 13:46:05 -0400
commit0f9258228e2b2070368ffccf5c243218128770a8 (patch)
treecb0d5f4b6d223e2a20a4d3f300ea1f266a4e6a40 /scripts
parentdffb86e468c8e02ba77283989aefef214d904dc5 (diff)
downloadtalos-obmc-uboot-0f9258228e2b2070368ffccf5c243218128770a8.zip
talos-obmc-uboot-0f9258228e2b2070368ffccf5c243218128770a8.tar.gz
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 'scripts')
-rw-r--r--scripts/Makefile.uncmd_spl3
1 files changed, 0 insertions, 3 deletions
diff --git a/scripts/Makefile.uncmd_spl b/scripts/Makefile.uncmd_spl
index b90fcb8..4003546 100644
--- a/scripts/Makefile.uncmd_spl
+++ b/scripts/Makefile.uncmd_spl
@@ -3,9 +3,6 @@
# TODO: Invent a better way
ifdef CONFIG_SPL_BUILD
-ifndef CONFIG_SPL_OF_CONTROL
-CONFIG_OF_CONTROL=
-endif
ifndef CONFIG_SPL_DM
CONFIG_DM_SERIAL=
OpenPOWER on IntegriCloud