[U-Boot] [PATCH v2 14/15] of: flip CONFIG_SPL_DISABLE_OF_CONTROL into CONFIG_SPL_OF_CONTROL

[Simon Glass]

Hi Masahiro,

On 1 August 2015 at 07:14, Masahiro Yamada
<yamada.masahiro at socionext.com> wrote:
> 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 actually two boards enabling OF_CONTROL on SPL:
>  - socfpga_arria5_defconfig
>  - socfpga_cyclone5_defconfig
>
> But they were enabled by mistake.

Yes it looks like they converted in between me generating the patch
and applying it. I did not notice. This underlines that we should
avoid negative options.

In any case this option only exists to avoid breaking existing boards
and I was hoping to drop it. My only concern here is that the option
(for a baord to use device tree in U-Boot proper but not in SPL) will
now live on. Still, for a few boards this will be necessary.

>
> Commit 47a785a9dd97 ("dts: Disable device tree for SPL on all
> boards") missed to add CONFIG_SPL_DISABLE_OF_CONTROL on those
> two boards.  They were silently enabled with OF_CONTROL on SPL
> without notifying their maintainers.
>
> After all, there exist no boards to support it in a justified
> process.
>
> Before being too late, delete all the defines in defconfig files
> and 'select's in Kconfig, and invert the logic.
>
> Signed-off-by: Masahiro Yamada <yamada.masahiro at socionext.com>
> ---
>
> Changes in v2:
>   - Rebase on commit cc35734358540a1
>
>  arch/arm/Kconfig                         | 3 ---
>  arch/arm/cpu/armv7/exynos/Kconfig        | 8 --------
>  arch/arm/cpu/armv7/s5pc1xx/Kconfig       | 2 --
>  arch/arm/mach-tegra/Kconfig              | 1 -
>  common/spl/spl.c                         | 2 +-
>  configs/am335x_boneblack_vboot_defconfig | 1 -
>  configs/arches_defconfig                 | 1 -
>  configs/canyonlands_defconfig            | 1 -
>  configs/galileo_defconfig                | 1 -
>  configs/microblaze-generic_defconfig     | 1 -
>  configs/odroid_defconfig                 | 1 -
>  configs/origen_defconfig                 | 1 -
>  configs/s5pc210_universal_defconfig      | 1 -
>  configs/socfpga_socrates_defconfig       | 1 -
>  configs/trats2_defconfig                 | 1 -
>  configs/trats_defconfig                  | 1 -
>  dts/Kconfig                              | 6 +++---
>  include/config_uncmd_spl.h               | 2 +-
>  include/fdtdec.h                         | 2 +-
>  lib/Makefile                             | 8 +++++++-
>  scripts/Makefile.uncmd_spl               | 2 +-
>  21 files changed, 14 insertions(+), 33 deletions(-)
>

Reviewed-by: Simon Glass <sjg at chromium.org>