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

2015-08-03 Thread Simon Glass 
Hi Masahiro,

On 1 August 2015 at 07:14, Masahiro Yamada
yamada.masah...@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.masah...@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 s...@chromium.org
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

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

2015-08-01 Thread Masahiro Yamada 
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.

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.masah...@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(-)

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 9127ace..6a8d8ba 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -651,7 +651,6 @@ config ARCH_SUNXI
select DM_USB
select OF_CONTROL
select OF_SEPARATE
-   select SPL_DISABLE_OF_CONTROL
select USB
select USB_STORAGE
 
@@ -676,7 +675,6 @@ config ARCH_ZYNQ
select CPU_V7
select SUPPORT_SPL
select OF_CONTROL
-   select SPL_DISABLE_OF_CONTROL
select DM
select DM_SPI
select DM_SPI_FLASH
@@ -806,7 +804,6 @@ config ARCH_UNIPHIER
select DM
select DM_SERIAL
select DM_I2C
-   select SPL_DISABLE_OF_CONTROL
help
  Support for UniPhier SoC family developed by Socionext Inc.
  (formerly, System LSI Business Division of Panasonic Corporation)
diff --git a/arch/arm/cpu/armv7/exynos/Kconfig 
b/arch/arm/cpu/armv7/exynos/Kconfig
index 4a7d82f..09cde42 100644
--- a/arch/arm/cpu/armv7/exynos/Kconfig
+++ b/arch/arm/cpu/armv7/exynos/Kconfig
@@ -8,7 +8,6 @@ config TARGET_SMDKV310
select SUPPORT_SPL
bool Exynos4210 SMDKV310 board
select OF_CONTROL
-   select SPL_DISABLE_OF_CONTROL
 
 config TARGET_TRATS
bool Exynos4210 Trats board
@@ -29,7 +28,6 @@ config TARGET_ODROID
 config TARGET_ODROID_XU3
bool Exynos5422 Odroid board
select OF_CONTROL
-   select SPL_DISABLE_OF_CONTROL
 
 config TARGET_ARNDALE
bool Exynos5250 Arndale board
@@ -37,37 +35,31 @@ config TARGET_ARNDALE
select CPU_V7_HAS_VIRT
select SUPPORT_SPL
select OF_CONTROL
-   select SPL_DISABLE_OF_CONTROL
 
 config TARGET_SMDK5250
bool SMDK5250 board
select SUPPORT_SPL
select OF_CONTROL
-   select SPL_DISABLE_OF_CONTROL
 
 config TARGET_SNOW
bool Snow board
select SUPPORT_SPL
select OF_CONTROL
-   select SPL_DISABLE_OF_CONTROL
 
 config TARGET_SMDK5420
bool SMDK5420 board
select SUPPORT_SPL
select OF_CONTROL
-   select SPL_DISABLE_OF_CONTROL
 
 config TARGET_PEACH_PI
bool Peach Pi board
select SUPPORT_SPL
select OF_CONTROL
-   select SPL_DISABLE_OF_CONTROL
 
 config TARGET_PEACH_PIT
bool Peach Pit board
select SUPPORT_SPL
select OF_CONTROL
-   select SPL_DISABLE_OF_CONTROL
 
 endchoice
 
diff --git a/arch/arm/cpu/armv7/s5pc1xx/Kconfig 
b/arch/arm/cpu/armv7/s5pc1xx/Kconfig
index 792ef59..04acdaa 100644
--- a/arch/arm/cpu/armv7/s5pc1xx/Kconfig
+++ b/arch/arm/cpu/armv7/s5pc1xx/Kconfig
@@ -7,12 +7,10 @@ choice
 config TARGET_S5P_GONI
bool S5P Goni board
select OF_CONTROL
-   select SPL_DISABLE_OF_CONTROL
 
 config TARGET_SMDKC100
bool Support smdkc100 board
select OF_CONTROL
-   select SPL_DISABLE_OF_CONTROL
 
 endchoice
 
diff --git a/arch/arm/mach-tegra/Kconfig b/arch/arm/mach-tegra/Kconfig
index ba0b865..a5b7e0d 100644
--- a/arch/arm/mach-tegra/Kconfig
+++ b/arch/arm/mach-tegra/Kconfig
@@ -5,7 +5,6 @@ config

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

2015-08-01 Thread Tom Rini 
On Sat, Aug 01, 2015 at 10:14:44PM +0900, Masahiro Yamada 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.
 
 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.masah...@socionext.com

Reviewed-by: Tom Rini tr...@konsulko.com

-- 
Tom


signature.asc
Description: Digital signature
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot