diff options
| author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2015-08-12 07:31:54 +0900 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-08-18 13:46:04 -0400 |
| commit | dffb86e468c8e02ba77283989aefef214d904dc5 (patch) | |
| tree | 6a34789586f2e78de5974ded230f13255f6da143 /lib | |
| parent | cc7aebe8198be062ae005448f78c7cdcbba825d4 (diff) | |
| download | u-boot-imx-dffb86e468c8e02ba77283989aefef214d904dc5.zip u-boot-imx-dffb86e468c8e02ba77283989aefef214d904dc5.tar.gz u-boot-imx-dffb86e468c8e02ba77283989aefef214d904dc5.tar.bz2 | |
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 'lib')
| -rw-r--r-- | lib/Makefile | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/lib/Makefile b/lib/Makefile index db7d980..3b6a74b 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -49,7 +49,13 @@ obj-$(CONFIG_BITREVERSE) += bitrev.o obj-y += list_sort.o endif -ifndef CONFIG_SPL_DISABLE_OF_CONTROL +ifndef CONFIG_SPL_BUILD +obj-$(CONFIG_OF_LIBFDT) += libfdt/ +obj-$(CONFIG_OF_CONTROL) += fdtdec_common.o +obj-$(CONFIG_OF_CONTROL) += fdtdec.o +endif + +ifdef CONFIG_SPL_OF_CONTROL obj-$(CONFIG_OF_LIBFDT) += libfdt/ obj-$(CONFIG_OF_CONTROL) += fdtdec_common.o obj-$(CONFIG_OF_CONTROL) += fdtdec.o |