summaryrefslogtreecommitdiffstats
path: root/include/fdtdec.h
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.masahiro@socionext.com>2015-08-12 07:31:54 +0900
committerTom Rini <trini@konsulko.com>2015-08-18 13:46:04 -0400
commitdffb86e468c8e02ba77283989aefef214d904dc5 (patch)
tree6a34789586f2e78de5974ded230f13255f6da143 /include/fdtdec.h
parentcc7aebe8198be062ae005448f78c7cdcbba825d4 (diff)
downloadblackbird-obmc-uboot-dffb86e468c8e02ba77283989aefef214d904dc5.tar.gz
blackbird-obmc-uboot-dffb86e468c8e02ba77283989aefef214d904dc5.zip
of: flip CONFIG_SPL_DISABLE_OF_CONTROL into CONFIG_SPL_OF_CONTROL
As we discussed a couple of times, negative CONFIG options make our life difficult; CONFIG_SYS_NO_FLASH, CONFIG_SYS_DCACHE_OFF, ... and here is another one. Now, there are three boards enabling OF_CONTROL on SPL: - socfpga_arria5_defconfig - socfpga_cyclone5_defconfig - socfpga_socrates_defconfig This commit adds CONFIG_SPL_OF_CONTROL for them and deletes CONFIG_SPL_DISABLE_OF_CONTROL from the other boards to invert the logic. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Reviewed-by: Tom Rini <trini@konsulko.com> Reviewed-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'include/fdtdec.h')
-rw-r--r--include/fdtdec.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/fdtdec.h b/include/fdtdec.h
index 2ef3f662cc..5796e272b2 100644
--- a/include/fdtdec.h
+++ b/include/fdtdec.h
@@ -46,7 +46,7 @@ struct fdt_memory {
#endif
#ifdef CONFIG_OF_CONTROL
-# if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_DISABLE_OF_CONTROL)
+# if defined(CONFIG_SPL_BUILD) && !defined(CONFIG_SPL_OF_CONTROL)
# define OF_CONTROL 0
# else
# define OF_CONTROL 1
OpenPOWER on IntegriCloud