defconfig: Add CONFIG_OF_CONTROL in zynq_picozed

PATCH New Jagan Teki 3 participants 9 messages Jun 29, 2015 – Jul 2, 2015

Subsystems (2)

Arm (32-bit) Arm/Zynq architecture

lore

Share & tools

lore

Jagan Teki

author

2015-06-29 09:03 UTC #0 lore raw

PATCH 1/2 defconfig: Add CONFIG_OF_CONTROL in zynq_picozed

Enable FDT support for zynq_picozed board.

Signed-off-by Jagan Teki <[email protected]>

Cc Michal Simek <[email protected]>

Cc Siva Durga Prasad Paladugu <[email protected]>

---
 configs/zynq_picozed_defconfig | 1 +
 1 file changed, 1 insertion(+)

configs/zynq_picozed_defconfig +1 -0

index af77a9d..76a76e0 100644
@@ -6,3 +6,4 @@ CONFIG_SPL=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_OF_CONTROL=y

Signature · 1 line

1.9.1

Jagan Teki

author

2015-07-01 17:07 UTC #1 lore raw

PATCH 1/2 defconfig: Add CONFIG_OF_CONTROL in zynq_picozed

Quoted 19 lines · Jagan Teki

Enable FDT support for zynq_picozed board.
Signed-off-by Jagan Teki <[email protected]>
Cc Michal Simek <[email protected]>
Cc Siva Durga Prasad Paladugu <[email protected]>
---
 configs/zynq_picozed_defconfig | 1 +
 1 file changed, 1 insertion(+)
configs/zynq_picozed_defconfig +1 -1
index af77a9d..76a76e0 100644
@@ -6,3 +6,4 @@ CONFIG_SPL=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_OF_CONTROL=y
--

Quoted 2 lines

1.9.1

Applied to u-boot-spi/master

thanks!

Signature · 1 line

Jagan | openedev.

Jagan Teki

author

2015-06-29 09:03 UTC #2 lore raw

PATCH 2/2 zynq: defconfig: Move CONFIG_OF_* to Kconfig

In reply to Jagan Teki

This commit moves:
- CONFIG_OF_CONTROL
- SPL_DISABLE_OF_CONTROL

from zynq_*_defconfig files into arch/arm/Kconfig "config ARCH_ZYNQ"

Signed-off-by Jagan Teki <[email protected]>

Cc Michal Simek <[email protected]>

Cc Siva Durga Prasad Paladugu <[email protected]>

Cc Masahiro Yamada <[email protected]>

---
 arch/arm/Kconfig                   | 2 ++
 configs/zynq_microzed_defconfig    | 2 --
 configs/zynq_picozed_defconfig     | 1 -
 configs/zynq_zc702_defconfig       | 1 -
 configs/zynq_zc706_defconfig       | 1 -
 configs/zynq_zc70x_defconfig       | 2 --
 configs/zynq_zc770_xm010_defconfig | 2 --
 configs/zynq_zc770_xm012_defconfig | 2 --
 configs/zynq_zc770_xm013_defconfig | 2 --
 configs/zynq_zed_defconfig         | 2 --
 configs/zynq_zybo_defconfig        | 2 --
 11 files changed, 2 insertions(+), 17 deletions(-)

arch/arm/Kconfig +2 -0

index 5f026f0..192d9cf 100644
@@ -670,6 +670,8 @@ config ARCH_ZYNQ
 	bool "Xilinx Zynq Platform"
 	select CPU_V7
 	select SUPPORT_SPL
+	select OF_CONTROL
+	select SPL_DISABLE_OF_CONTROL
 	select DM
 	select DM_SPI
 	select DM_SPI_FLASH

configs/zynq_microzed_defconfig +0 -2

index 533cdb5..c878924 100644
@@ -10,5 +10,3 @@ CONFIG_FIT_SIGNATURE=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
-CONFIG_OF_CONTROL=y
-CONFIG_SPL_DISABLE_OF_CONTROL=y

configs/zynq_picozed_defconfig +0 -1

index 76a76e0..af77a9d 100644
@@ -6,4 +6,3 @@ CONFIG_SPL=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
-CONFIG_OF_CONTROL=y

configs/zynq_zc702_defconfig +0 -1

index 2e40508..5dde452 100644
@@ -10,4 +10,3 @@ CONFIG_FIT_SIGNATURE=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
-CONFIG_OF_CONTROL=y

configs/zynq_zc706_defconfig +0 -1

index 7c3713e..0f96d16 100644
@@ -10,4 +10,3 @@ CONFIG_FIT_SIGNATURE=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
-CONFIG_OF_CONTROL=y

configs/zynq_zc70x_defconfig +0 -2

index 41c04bb..525c538 100644
@@ -10,5 +10,3 @@ CONFIG_FIT_SIGNATURE=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
-CONFIG_OF_CONTROL=y
-CONFIG_SPL_DISABLE_OF_CONTROL=y

configs/zynq_zc770_xm010_defconfig +0 -2

index 73b5854..f1fc283 100644
@@ -11,6 +11,4 @@ CONFIG_SYS_EXTRA_OPTIONS="ZC770_XM010"
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
-CONFIG_OF_CONTROL=y
-CONFIG_SPL_DISABLE_OF_CONTROL=y
 CONFIG_SPI_FLASH=y

configs/zynq_zc770_xm012_defconfig +0 -2

index 0d5c77e..73ed13d 100644
@@ -9,5 +9,3 @@ CONFIG_FIT_VERBOSE=y
 CONFIG_FIT_SIGNATURE=y
 CONFIG_SYS_EXTRA_OPTIONS="ZC770_XM012"
 # CONFIG_CMD_SETEXPR is not set
-CONFIG_OF_CONTROL=y
-CONFIG_SPL_DISABLE_OF_CONTROL=y

configs/zynq_zc770_xm013_defconfig +0 -2

index 8d320a1..211a41d 100644
@@ -11,5 +11,3 @@ CONFIG_SYS_EXTRA_OPTIONS="ZC770_XM013"
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
-CONFIG_OF_CONTROL=y
-CONFIG_SPL_DISABLE_OF_CONTROL=y

configs/zynq_zed_defconfig +0 -2

index 9f37849..f3c63f9 100644
@@ -10,5 +10,3 @@ CONFIG_FIT_SIGNATURE=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
-CONFIG_OF_CONTROL=y
-CONFIG_SPL_DISABLE_OF_CONTROL=y

configs/zynq_zybo_defconfig +0 -2

index e25573b..0c6117d 100644
@@ -10,5 +10,3 @@ CONFIG_FIT_SIGNATURE=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
-CONFIG_OF_CONTROL=y
-CONFIG_SPL_DISABLE_OF_CONTROL=y

Signature · 1 line

1.9.1

Jagan Teki

author

2015-07-01 17:08 UTC #3 lore raw

PATCH 2/2 zynq: defconfig: Move CONFIG_OF_* to Kconfig

Quoted 136 lines · Jagan Teki

This commit moves:
- CONFIG_OF_CONTROL
- SPL_DISABLE_OF_CONTROL

from zynq_*_defconfig files into arch/arm/Kconfig "config ARCH_ZYNQ"

Signed-off-by Jagan Teki <[email protected]>

Cc Michal Simek <[email protected]>

Cc Siva Durga Prasad Paladugu <[email protected]>

Cc Masahiro Yamada <[email protected]>

---
 arch/arm/Kconfig                   | 2 ++
 configs/zynq_microzed_defconfig    | 2 --
 configs/zynq_picozed_defconfig     | 1 -
 configs/zynq_zc702_defconfig       | 1 -
 configs/zynq_zc706_defconfig       | 1 -
 configs/zynq_zc70x_defconfig       | 2 --
 configs/zynq_zc770_xm010_defconfig | 2 --
 configs/zynq_zc770_xm012_defconfig | 2 --
 configs/zynq_zc770_xm013_defconfig | 2 --
 configs/zynq_zed_defconfig         | 2 --
 configs/zynq_zybo_defconfig        | 2 --
 11 files changed, 2 insertions(+), 17 deletions(-)

arch/arm/Kconfig +2 -0

index 5f026f0..192d9cf 100644
@@ -670,6 +670,8 @@ config ARCH_ZYNQ
        bool "Xilinx Zynq Platform"
        select CPU_V7
        select SUPPORT_SPL
+       select OF_CONTROL
+       select SPL_DISABLE_OF_CONTROL
        select DM
        select DM_SPI
        select DM_SPI_FLASH

configs/zynq_microzed_defconfig +0 -2

index 533cdb5..c878924 100644
@@ -10,5 +10,3 @@ CONFIG_FIT_SIGNATURE=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
-CONFIG_OF_CONTROL=y
-CONFIG_SPL_DISABLE_OF_CONTROL=y

configs/zynq_picozed_defconfig +0 -1

index 76a76e0..af77a9d 100644
@@ -6,4 +6,3 @@ CONFIG_SPL=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
-CONFIG_OF_CONTROL=y

configs/zynq_zc702_defconfig +0 -1

index 2e40508..5dde452 100644
@@ -10,4 +10,3 @@ CONFIG_FIT_SIGNATURE=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
-CONFIG_OF_CONTROL=y

configs/zynq_zc706_defconfig +0 -1

index 7c3713e..0f96d16 100644
@@ -10,4 +10,3 @@ CONFIG_FIT_SIGNATURE=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
-CONFIG_OF_CONTROL=y

configs/zynq_zc70x_defconfig +0 -2

index 41c04bb..525c538 100644
@@ -10,5 +10,3 @@ CONFIG_FIT_SIGNATURE=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
-CONFIG_OF_CONTROL=y
-CONFIG_SPL_DISABLE_OF_CONTROL=y

configs/zynq_zc770_xm010_defconfig +0 -2

index 73b5854..f1fc283 100644
@@ -11,6 +11,4 @@ CONFIG_SYS_EXTRA_OPTIONS="ZC770_XM010"
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
-CONFIG_OF_CONTROL=y
-CONFIG_SPL_DISABLE_OF_CONTROL=y
 CONFIG_SPI_FLASH=y

configs/zynq_zc770_xm012_defconfig +0 -2

index 0d5c77e..73ed13d 100644
@@ -9,5 +9,3 @@ CONFIG_FIT_VERBOSE=y
 CONFIG_FIT_SIGNATURE=y
 CONFIG_SYS_EXTRA_OPTIONS="ZC770_XM012"
 # CONFIG_CMD_SETEXPR is not set
-CONFIG_OF_CONTROL=y
-CONFIG_SPL_DISABLE_OF_CONTROL=y

configs/zynq_zc770_xm013_defconfig +0 -2

index 8d320a1..211a41d 100644
@@ -11,5 +11,3 @@ CONFIG_SYS_EXTRA_OPTIONS="ZC770_XM013"
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
-CONFIG_OF_CONTROL=y
-CONFIG_SPL_DISABLE_OF_CONTROL=y

configs/zynq_zed_defconfig +0 -2

index 9f37849..f3c63f9 100644
@@ -10,5 +10,3 @@ CONFIG_FIT_SIGNATURE=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
-CONFIG_OF_CONTROL=y
-CONFIG_SPL_DISABLE_OF_CONTROL=y

configs/zynq_zybo_defconfig +0 -3

index e25573b..0c6117d 100644
@@ -10,5 +10,3 @@ CONFIG_FIT_SIGNATURE=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
-CONFIG_OF_CONTROL=y
-CONFIG_SPL_DISABLE_OF_CONTROL=y
--

Quoted 2 lines

1.9.1

Applied to u-boot-spi/master

thanks!

Signature · 1 line

Jagan | openedev.

Masahiro Yamada

2015-07-02 01:20 UTC #4 lore raw

PATCH 2/2 zynq: defconfig: Move CONFIG_OF_* to Kconfig

2015-07-02 2:08 GMT+09:00 Jagan Teki <[email protected]>:

Quoted 133 lines · Jagan Teki

Quoted 132 lines

This commit moves:
- CONFIG_OF_CONTROL
- SPL_DISABLE_OF_CONTROL

from zynq_*_defconfig files into arch/arm/Kconfig "config ARCH_ZYNQ"

Signed-off-by Jagan Teki <[email protected]>

Cc Michal Simek <[email protected]>

Cc Siva Durga Prasad Paladugu <[email protected]>

Cc Masahiro Yamada <[email protected]>

---
 arch/arm/Kconfig                   | 2 ++
 configs/zynq_microzed_defconfig    | 2 --
 configs/zynq_picozed_defconfig     | 1 -
 configs/zynq_zc702_defconfig       | 1 -
 configs/zynq_zc706_defconfig       | 1 -
 configs/zynq_zc70x_defconfig       | 2 --
 configs/zynq_zc770_xm010_defconfig | 2 --
 configs/zynq_zc770_xm012_defconfig | 2 --
 configs/zynq_zc770_xm013_defconfig | 2 --
 configs/zynq_zed_defconfig         | 2 --
 configs/zynq_zybo_defconfig        | 2 --
 11 files changed, 2 insertions(+), 17 deletions(-)

arch/arm/Kconfig +2 -0

index 5f026f0..192d9cf 100644
@@ -670,6 +670,8 @@ config ARCH_ZYNQ
        bool "Xilinx Zynq Platform"
        select CPU_V7
        select SUPPORT_SPL
+       select OF_CONTROL
+       select SPL_DISABLE_OF_CONTROL
        select DM
        select DM_SPI
        select DM_SPI_FLASH

configs/zynq_microzed_defconfig +0 -2

index 533cdb5..c878924 100644
@@ -10,5 +10,3 @@ CONFIG_FIT_SIGNATURE=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
-CONFIG_OF_CONTROL=y
-CONFIG_SPL_DISABLE_OF_CONTROL=y

configs/zynq_picozed_defconfig +0 -1

index 76a76e0..af77a9d 100644
@@ -6,4 +6,3 @@ CONFIG_SPL=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
-CONFIG_OF_CONTROL=y

configs/zynq_zc702_defconfig +0 -1

index 2e40508..5dde452 100644
@@ -10,4 +10,3 @@ CONFIG_FIT_SIGNATURE=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
-CONFIG_OF_CONTROL=y

configs/zynq_zc706_defconfig +0 -1

index 7c3713e..0f96d16 100644
@@ -10,4 +10,3 @@ CONFIG_FIT_SIGNATURE=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
-CONFIG_OF_CONTROL=y

configs/zynq_zc70x_defconfig +0 -2

index 41c04bb..525c538 100644
@@ -10,5 +10,3 @@ CONFIG_FIT_SIGNATURE=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
-CONFIG_OF_CONTROL=y
-CONFIG_SPL_DISABLE_OF_CONTROL=y

configs/zynq_zc770_xm010_defconfig +0 -2

index 73b5854..f1fc283 100644
@@ -11,6 +11,4 @@ CONFIG_SYS_EXTRA_OPTIONS="ZC770_XM010"
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
-CONFIG_OF_CONTROL=y
-CONFIG_SPL_DISABLE_OF_CONTROL=y
 CONFIG_SPI_FLASH=y

configs/zynq_zc770_xm012_defconfig +0 -2

index 0d5c77e..73ed13d 100644
@@ -9,5 +9,3 @@ CONFIG_FIT_VERBOSE=y
 CONFIG_FIT_SIGNATURE=y
 CONFIG_SYS_EXTRA_OPTIONS="ZC770_XM012"
 # CONFIG_CMD_SETEXPR is not set
-CONFIG_OF_CONTROL=y
-CONFIG_SPL_DISABLE_OF_CONTROL=y

configs/zynq_zc770_xm013_defconfig +0 -2

index 8d320a1..211a41d 100644
@@ -11,5 +11,3 @@ CONFIG_SYS_EXTRA_OPTIONS="ZC770_XM013"
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
-CONFIG_OF_CONTROL=y
-CONFIG_SPL_DISABLE_OF_CONTROL=y

configs/zynq_zed_defconfig +0 -2

index 9f37849..f3c63f9 100644
@@ -10,5 +10,3 @@ CONFIG_FIT_SIGNATURE=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
-CONFIG_OF_CONTROL=y
-CONFIG_SPL_DISABLE_OF_CONTROL=y

configs/zynq_zybo_defconfig +0 -0

index e25573b..0c6117d 100644
@@ -10,5 +10,3 @@ CONFIG_FIT_SIGNATURE=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set

Quoted 9 lines

Quoted 6 lines
configs/zynq_zybo_defconfig +0 -3
 # CONFIG_CMD_SETEXPR is not set
-CONFIG_OF_CONTROL=y
-CONFIG_SPL_DISABLE_OF_CONTROL=y
--
1.9.1
Applied to u-boot-spi/master

Why u-boot-spi/master, not u-boot-microblaze/zynq ?

Note this patch will change the behavior.

It is dropping the non-DeviceTree boot support,
so I'd like Michal's Acked-by before moving on.

Signature · 2 lines

Best Regards
Masahiro Yamada

Jagan Teki

author

2015-07-02 06:11 UTC #5 lore raw

PATCH 2/2 zynq: defconfig: Move CONFIG_OF_* to Kconfig

Quoted 145 lines · Masahiro Yamada

2015-07-02 2:08 GMT+09:00 Jagan Teki <[email protected]>:

Quoted 133 lines · Jagan Teki

Quoted 132 lines

This commit moves:
- CONFIG_OF_CONTROL
- SPL_DISABLE_OF_CONTROL

from zynq_*_defconfig files into arch/arm/Kconfig "config ARCH_ZYNQ"

Signed-off-by Jagan Teki <[email protected]>

Cc Michal Simek <[email protected]>

Cc Siva Durga Prasad Paladugu <[email protected]>

Cc Masahiro Yamada <[email protected]>

---
 arch/arm/Kconfig                   | 2 ++
 configs/zynq_microzed_defconfig    | 2 --
 configs/zynq_picozed_defconfig     | 1 -
 configs/zynq_zc702_defconfig       | 1 -
 configs/zynq_zc706_defconfig       | 1 -
 configs/zynq_zc70x_defconfig       | 2 --
 configs/zynq_zc770_xm010_defconfig | 2 --
 configs/zynq_zc770_xm012_defconfig | 2 --
 configs/zynq_zc770_xm013_defconfig | 2 --
 configs/zynq_zed_defconfig         | 2 --
 configs/zynq_zybo_defconfig        | 2 --
 11 files changed, 2 insertions(+), 17 deletions(-)

arch/arm/Kconfig +2 -0

index 5f026f0..192d9cf 100644
@@ -670,6 +670,8 @@ config ARCH_ZYNQ
        bool "Xilinx Zynq Platform"
        select CPU_V7
        select SUPPORT_SPL
+       select OF_CONTROL
+       select SPL_DISABLE_OF_CONTROL
        select DM
        select DM_SPI
        select DM_SPI_FLASH

configs/zynq_microzed_defconfig +0 -2

index 533cdb5..c878924 100644
@@ -10,5 +10,3 @@ CONFIG_FIT_SIGNATURE=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
-CONFIG_OF_CONTROL=y
-CONFIG_SPL_DISABLE_OF_CONTROL=y

configs/zynq_picozed_defconfig +0 -1

index 76a76e0..af77a9d 100644
@@ -6,4 +6,3 @@ CONFIG_SPL=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
-CONFIG_OF_CONTROL=y

configs/zynq_zc702_defconfig +0 -1

index 2e40508..5dde452 100644
@@ -10,4 +10,3 @@ CONFIG_FIT_SIGNATURE=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
-CONFIG_OF_CONTROL=y

configs/zynq_zc706_defconfig +0 -1

index 7c3713e..0f96d16 100644
@@ -10,4 +10,3 @@ CONFIG_FIT_SIGNATURE=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
-CONFIG_OF_CONTROL=y

configs/zynq_zc70x_defconfig +0 -2

index 41c04bb..525c538 100644
@@ -10,5 +10,3 @@ CONFIG_FIT_SIGNATURE=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
-CONFIG_OF_CONTROL=y
-CONFIG_SPL_DISABLE_OF_CONTROL=y

configs/zynq_zc770_xm010_defconfig +0 -2

index 73b5854..f1fc283 100644
@@ -11,6 +11,4 @@ CONFIG_SYS_EXTRA_OPTIONS="ZC770_XM010"
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
-CONFIG_OF_CONTROL=y
-CONFIG_SPL_DISABLE_OF_CONTROL=y
 CONFIG_SPI_FLASH=y

configs/zynq_zc770_xm012_defconfig +0 -2

index 0d5c77e..73ed13d 100644
@@ -9,5 +9,3 @@ CONFIG_FIT_VERBOSE=y
 CONFIG_FIT_SIGNATURE=y
 CONFIG_SYS_EXTRA_OPTIONS="ZC770_XM012"
 # CONFIG_CMD_SETEXPR is not set
-CONFIG_OF_CONTROL=y
-CONFIG_SPL_DISABLE_OF_CONTROL=y

configs/zynq_zc770_xm013_defconfig +0 -2

index 8d320a1..211a41d 100644
@@ -11,5 +11,3 @@ CONFIG_SYS_EXTRA_OPTIONS="ZC770_XM013"
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
-CONFIG_OF_CONTROL=y
-CONFIG_SPL_DISABLE_OF_CONTROL=y

configs/zynq_zed_defconfig +0 -2

index 9f37849..f3c63f9 100644
@@ -10,5 +10,3 @@ CONFIG_FIT_SIGNATURE=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
-CONFIG_OF_CONTROL=y
-CONFIG_SPL_DISABLE_OF_CONTROL=y

configs/zynq_zybo_defconfig +0 -0

index e25573b..0c6117d 100644
@@ -10,5 +10,3 @@ CONFIG_FIT_SIGNATURE=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set

Quoted 9 lines

Quoted 6 lines
configs/zynq_zybo_defconfig +0 -3
 # CONFIG_CMD_SETEXPR is not set
-CONFIG_OF_CONTROL=y
-CONFIG_SPL_DISABLE_OF_CONTROL=y
--
1.9.1
Applied to u-boot-spi/master

Quoted 1 line

Why u-boot-spi/master, not u-boot-microblaze/zynq ?

As I sent these patches, as part of zynq dm support and dm-spi.

Quoted 6 lines

Note this patch will change the behavior.
It is dropping the non-DeviceTree boot support,
so I'd like Michal's Acked-by before moving on.

Verified the device-tree and along with dm-spi on zynq.

Michal, Could you comment on this.

thanks!

Signature · 1 line

Jagan | openedev.

Michal Simek

2015-07-02 08:41 UTC #6 lore raw

PATCH 2/2 zynq: defconfig: Move CONFIG_OF_* to Kconfig

Quoted 152 lines · Jagan Teki

Quoted 145 lines · Masahiro Yamada

2015-07-02 2:08 GMT+09:00 Jagan Teki <[email protected]>:

Quoted 133 lines · Jagan Teki

Quoted 132 lines

This commit moves:
- CONFIG_OF_CONTROL
- SPL_DISABLE_OF_CONTROL

from zynq_*_defconfig files into arch/arm/Kconfig "config ARCH_ZYNQ"

Signed-off-by Jagan Teki <[email protected]>

Cc Michal Simek <[email protected]>

Cc Siva Durga Prasad Paladugu <[email protected]>

Cc Masahiro Yamada <[email protected]>

---
 arch/arm/Kconfig                   | 2 ++
 configs/zynq_microzed_defconfig    | 2 --
 configs/zynq_picozed_defconfig     | 1 -
 configs/zynq_zc702_defconfig       | 1 -
 configs/zynq_zc706_defconfig       | 1 -
 configs/zynq_zc70x_defconfig       | 2 --
 configs/zynq_zc770_xm010_defconfig | 2 --
 configs/zynq_zc770_xm012_defconfig | 2 --
 configs/zynq_zc770_xm013_defconfig | 2 --
 configs/zynq_zed_defconfig         | 2 --
 configs/zynq_zybo_defconfig        | 2 --
 11 files changed, 2 insertions(+), 17 deletions(-)

arch/arm/Kconfig +2 -0

index 5f026f0..192d9cf 100644
@@ -670,6 +670,8 @@ config ARCH_ZYNQ
        bool "Xilinx Zynq Platform"
        select CPU_V7
        select SUPPORT_SPL
+       select OF_CONTROL
+       select SPL_DISABLE_OF_CONTROL
        select DM
        select DM_SPI
        select DM_SPI_FLASH

configs/zynq_microzed_defconfig +0 -2

index 533cdb5..c878924 100644
@@ -10,5 +10,3 @@ CONFIG_FIT_SIGNATURE=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
-CONFIG_OF_CONTROL=y
-CONFIG_SPL_DISABLE_OF_CONTROL=y

configs/zynq_picozed_defconfig +0 -1

index 76a76e0..af77a9d 100644
@@ -6,4 +6,3 @@ CONFIG_SPL=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
-CONFIG_OF_CONTROL=y

configs/zynq_zc702_defconfig +0 -1

index 2e40508..5dde452 100644
@@ -10,4 +10,3 @@ CONFIG_FIT_SIGNATURE=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
-CONFIG_OF_CONTROL=y

configs/zynq_zc706_defconfig +0 -1

index 7c3713e..0f96d16 100644
@@ -10,4 +10,3 @@ CONFIG_FIT_SIGNATURE=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
-CONFIG_OF_CONTROL=y

configs/zynq_zc70x_defconfig +0 -2

index 41c04bb..525c538 100644
@@ -10,5 +10,3 @@ CONFIG_FIT_SIGNATURE=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
-CONFIG_OF_CONTROL=y
-CONFIG_SPL_DISABLE_OF_CONTROL=y

configs/zynq_zc770_xm010_defconfig +0 -2

index 73b5854..f1fc283 100644
@@ -11,6 +11,4 @@ CONFIG_SYS_EXTRA_OPTIONS="ZC770_XM010"
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
-CONFIG_OF_CONTROL=y
-CONFIG_SPL_DISABLE_OF_CONTROL=y
 CONFIG_SPI_FLASH=y

configs/zynq_zc770_xm012_defconfig +0 -2

index 0d5c77e..73ed13d 100644
@@ -9,5 +9,3 @@ CONFIG_FIT_VERBOSE=y
 CONFIG_FIT_SIGNATURE=y
 CONFIG_SYS_EXTRA_OPTIONS="ZC770_XM012"
 # CONFIG_CMD_SETEXPR is not set
-CONFIG_OF_CONTROL=y
-CONFIG_SPL_DISABLE_OF_CONTROL=y

configs/zynq_zc770_xm013_defconfig +0 -2

index 8d320a1..211a41d 100644
@@ -11,5 +11,3 @@ CONFIG_SYS_EXTRA_OPTIONS="ZC770_XM013"
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
-CONFIG_OF_CONTROL=y
-CONFIG_SPL_DISABLE_OF_CONTROL=y

configs/zynq_zed_defconfig +0 -2

index 9f37849..f3c63f9 100644
@@ -10,5 +10,3 @@ CONFIG_FIT_SIGNATURE=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
-CONFIG_OF_CONTROL=y
-CONFIG_SPL_DISABLE_OF_CONTROL=y

configs/zynq_zybo_defconfig +0 -0

index e25573b..0c6117d 100644
@@ -10,5 +10,3 @@ CONFIG_FIT_SIGNATURE=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set

Quoted 9 lines

Quoted 6 lines
configs/zynq_zybo_defconfig +0 -3
 # CONFIG_CMD_SETEXPR is not set
-CONFIG_OF_CONTROL=y
-CONFIG_SPL_DISABLE_OF_CONTROL=y
--
1.9.1
Applied to u-boot-spi/master

Quoted 1 line

Why u-boot-spi/master, not u-boot-microblaze/zynq ?

As I sent these patches, as part of zynq dm support and dm-spi.

Quoted 2 lines

Quoted 8 lines

Quoted 4 lines
Note this patch will change the behavior.
It is dropping the non-DeviceTree boot support,
so I'd like Michal's Acked-by before moving on.
Verified the device-tree and along with dm-spi on zynq.
Michal, Could you comment on this.

I don't have picozed board here to be able to test it. And doesn't matter because it it is applied to mainline already.

I am just now sure why these big changes are coming after rc3.

Thanks,
Michal

Jagan Teki

author

2015-07-02 09:19 UTC #7 lore raw

PATCH 2/2 zynq: defconfig: Move CONFIG_OF_* to Kconfig

Quoted 158 lines · Michal Simek

Quoted 157 lines · Jagan Teki

Quoted 145 lines · Masahiro Yamada

2015-07-02 2:08 GMT+09:00 Jagan Teki <[email protected]>:

Quoted 133 lines · Jagan Teki

Quoted 132 lines

This commit moves:
- CONFIG_OF_CONTROL
- SPL_DISABLE_OF_CONTROL

from zynq_*_defconfig files into arch/arm/Kconfig "config ARCH_ZYNQ"

Signed-off-by Jagan Teki <[email protected]>

Cc Michal Simek <[email protected]>

Cc Siva Durga Prasad Paladugu <[email protected]>

Cc Masahiro Yamada <[email protected]>

---
 arch/arm/Kconfig                   | 2 ++
 configs/zynq_microzed_defconfig    | 2 --
 configs/zynq_picozed_defconfig     | 1 -
 configs/zynq_zc702_defconfig       | 1 -
 configs/zynq_zc706_defconfig       | 1 -
 configs/zynq_zc70x_defconfig       | 2 --
 configs/zynq_zc770_xm010_defconfig | 2 --
 configs/zynq_zc770_xm012_defconfig | 2 --
 configs/zynq_zc770_xm013_defconfig | 2 --
 configs/zynq_zed_defconfig         | 2 --
 configs/zynq_zybo_defconfig        | 2 --
 11 files changed, 2 insertions(+), 17 deletions(-)

arch/arm/Kconfig +2 -0

index 5f026f0..192d9cf 100644
@@ -670,6 +670,8 @@ config ARCH_ZYNQ
        bool "Xilinx Zynq Platform"
        select CPU_V7
        select SUPPORT_SPL
+       select OF_CONTROL
+       select SPL_DISABLE_OF_CONTROL
        select DM
        select DM_SPI
        select DM_SPI_FLASH

configs/zynq_microzed_defconfig +0 -2

index 533cdb5..c878924 100644
@@ -10,5 +10,3 @@ CONFIG_FIT_SIGNATURE=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
-CONFIG_OF_CONTROL=y
-CONFIG_SPL_DISABLE_OF_CONTROL=y

configs/zynq_picozed_defconfig +0 -1

index 76a76e0..af77a9d 100644
@@ -6,4 +6,3 @@ CONFIG_SPL=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
-CONFIG_OF_CONTROL=y

configs/zynq_zc702_defconfig +0 -1

index 2e40508..5dde452 100644
@@ -10,4 +10,3 @@ CONFIG_FIT_SIGNATURE=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
-CONFIG_OF_CONTROL=y

configs/zynq_zc706_defconfig +0 -1

index 7c3713e..0f96d16 100644
@@ -10,4 +10,3 @@ CONFIG_FIT_SIGNATURE=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
-CONFIG_OF_CONTROL=y

configs/zynq_zc70x_defconfig +0 -2

index 41c04bb..525c538 100644
@@ -10,5 +10,3 @@ CONFIG_FIT_SIGNATURE=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
-CONFIG_OF_CONTROL=y
-CONFIG_SPL_DISABLE_OF_CONTROL=y

configs/zynq_zc770_xm010_defconfig +0 -2

index 73b5854..f1fc283 100644
@@ -11,6 +11,4 @@ CONFIG_SYS_EXTRA_OPTIONS="ZC770_XM010"
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
-CONFIG_OF_CONTROL=y
-CONFIG_SPL_DISABLE_OF_CONTROL=y
 CONFIG_SPI_FLASH=y

configs/zynq_zc770_xm012_defconfig +0 -2

index 0d5c77e..73ed13d 100644
@@ -9,5 +9,3 @@ CONFIG_FIT_VERBOSE=y
 CONFIG_FIT_SIGNATURE=y
 CONFIG_SYS_EXTRA_OPTIONS="ZC770_XM012"
 # CONFIG_CMD_SETEXPR is not set
-CONFIG_OF_CONTROL=y
-CONFIG_SPL_DISABLE_OF_CONTROL=y

configs/zynq_zc770_xm013_defconfig +0 -2

index 8d320a1..211a41d 100644
@@ -11,5 +11,3 @@ CONFIG_SYS_EXTRA_OPTIONS="ZC770_XM013"
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
-CONFIG_OF_CONTROL=y
-CONFIG_SPL_DISABLE_OF_CONTROL=y

configs/zynq_zed_defconfig +0 -2

index 9f37849..f3c63f9 100644
@@ -10,5 +10,3 @@ CONFIG_FIT_SIGNATURE=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
-CONFIG_OF_CONTROL=y
-CONFIG_SPL_DISABLE_OF_CONTROL=y

configs/zynq_zybo_defconfig +0 -0

index e25573b..0c6117d 100644
@@ -10,5 +10,3 @@ CONFIG_FIT_SIGNATURE=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set

Quoted 9 lines

Quoted 6 lines
configs/zynq_zybo_defconfig +0 -3
 # CONFIG_CMD_SETEXPR is not set
-CONFIG_OF_CONTROL=y
-CONFIG_SPL_DISABLE_OF_CONTROL=y
--
1.9.1
Applied to u-boot-spi/master

Quoted 1 line

Why u-boot-spi/master, not u-boot-microblaze/zynq ?

As I sent these patches, as part of zynq dm support and dm-spi.

Quoted 6 lines

Note this patch will change the behavior.
It is dropping the non-DeviceTree boot support,
so I'd like Michal's Acked-by before moving on.

Quoted 8 lines

Quoted 3 lines
Verified the device-tree and along with dm-spi on zynq.
Michal, Could you comment on this.
I don't have picozed board here to be able to test it. And doesn't matter because it it is applied to mainline already.
I am just now sure why these big changes are coming after rc3.

The only reason I have applied these as DM and DM_SPI added in previous patches and picozed requires OF_CONTROL to built properly.

And we have verified this on microzed and xm010 as well.

thanks!

Signature · 1 line

Jagan | openedev.

Michal Simek

2015-07-02 09:53 UTC #8 lore raw

PATCH 2/2 zynq: defconfig: Move CONFIG_OF_* to Kconfig

Quoted 166 lines · Jagan Teki

Quoted 165 lines · Michal Simek
Quoted 152 lines · Jagan Teki
Quoted 145 lines · Masahiro Yamada
2015-07-02 2:08 GMT+09:00 Jagan Teki <[email protected]>:
Quoted 133 lines · Jagan Teki
Quoted 132 lines
This commit moves:
- CONFIG_OF_CONTROL
- SPL_DISABLE_OF_CONTROL
from zynq_*_defconfig files into arch/arm/Kconfig "config ARCH_ZYNQ"
Signed-off-by Jagan Teki <[email protected]>
Cc Michal Simek <[email protected]>
Cc Siva Durga Prasad Paladugu <[email protected]>
Cc Masahiro Yamada <[email protected]>
---
 arch/arm/Kconfig                   | 2 ++
 configs/zynq_microzed_defconfig    | 2 --
 configs/zynq_picozed_defconfig     | 1 -
 configs/zynq_zc702_defconfig       | 1 -
 configs/zynq_zc706_defconfig       | 1 -
 configs/zynq_zc70x_defconfig       | 2 --
 configs/zynq_zc770_xm010_defconfig | 2 --
 configs/zynq_zc770_xm012_defconfig | 2 --
 configs/zynq_zc770_xm013_defconfig | 2 --
 configs/zynq_zed_defconfig         | 2 --
 configs/zynq_zybo_defconfig        | 2 --
 11 files changed, 2 insertions(+), 17 deletions(-)
arch/arm/Kconfig +2 -0
index 5f026f0..192d9cf 100644
@@ -670,6 +670,8 @@ config ARCH_ZYNQ
        bool "Xilinx Zynq Platform"
        select CPU_V7
        select SUPPORT_SPL
+       select OF_CONTROL
+       select SPL_DISABLE_OF_CONTROL
        select DM
        select DM_SPI
        select DM_SPI_FLASH
configs/zynq_microzed_defconfig +0 -2
index 533cdb5..c878924 100644
@@ -10,5 +10,3 @@ CONFIG_FIT_SIGNATURE=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
-CONFIG_OF_CONTROL=y
-CONFIG_SPL_DISABLE_OF_CONTROL=y
configs/zynq_picozed_defconfig +0 -1
index 76a76e0..af77a9d 100644
@@ -6,4 +6,3 @@ CONFIG_SPL=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
-CONFIG_OF_CONTROL=y
configs/zynq_zc702_defconfig +0 -1
index 2e40508..5dde452 100644
@@ -10,4 +10,3 @@ CONFIG_FIT_SIGNATURE=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
-CONFIG_OF_CONTROL=y
configs/zynq_zc706_defconfig +0 -1
index 7c3713e..0f96d16 100644
@@ -10,4 +10,3 @@ CONFIG_FIT_SIGNATURE=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
-CONFIG_OF_CONTROL=y
configs/zynq_zc70x_defconfig +0 -2
index 41c04bb..525c538 100644
@@ -10,5 +10,3 @@ CONFIG_FIT_SIGNATURE=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
-CONFIG_OF_CONTROL=y
-CONFIG_SPL_DISABLE_OF_CONTROL=y
configs/zynq_zc770_xm010_defconfig +0 -2
index 73b5854..f1fc283 100644
@@ -11,6 +11,4 @@ CONFIG_SYS_EXTRA_OPTIONS="ZC770_XM010"
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
-CONFIG_OF_CONTROL=y
-CONFIG_SPL_DISABLE_OF_CONTROL=y
 CONFIG_SPI_FLASH=y
configs/zynq_zc770_xm012_defconfig +0 -2
index 0d5c77e..73ed13d 100644
@@ -9,5 +9,3 @@ CONFIG_FIT_VERBOSE=y
 CONFIG_FIT_SIGNATURE=y
 CONFIG_SYS_EXTRA_OPTIONS="ZC770_XM012"
 # CONFIG_CMD_SETEXPR is not set
-CONFIG_OF_CONTROL=y
-CONFIG_SPL_DISABLE_OF_CONTROL=y
configs/zynq_zc770_xm013_defconfig +0 -2
index 8d320a1..211a41d 100644
@@ -11,5 +11,3 @@ CONFIG_SYS_EXTRA_OPTIONS="ZC770_XM013"
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
-CONFIG_OF_CONTROL=y
-CONFIG_SPL_DISABLE_OF_CONTROL=y
configs/zynq_zed_defconfig +0 -2
index 9f37849..f3c63f9 100644
@@ -10,5 +10,3 @@ CONFIG_FIT_SIGNATURE=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
-CONFIG_OF_CONTROL=y
-CONFIG_SPL_DISABLE_OF_CONTROL=y
configs/zynq_zybo_defconfig +0 -0
index e25573b..0c6117d 100644
@@ -10,5 +10,3 @@ CONFIG_FIT_SIGNATURE=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
Quoted 9 lines
Quoted 6 lines
configs/zynq_zybo_defconfig +0 -3
 # CONFIG_CMD_SETEXPR is not set
-CONFIG_OF_CONTROL=y
-CONFIG_SPL_DISABLE_OF_CONTROL=y
--
1.9.1
Applied to u-boot-spi/master
Quoted 1 line
Why u-boot-spi/master, not u-boot-microblaze/zynq ?
As I sent these patches, as part of zynq dm support and dm-spi.
Quoted 2 lines
Quoted 8 lines
Quoted 4 lines
Note this patch will change the behavior.
It is dropping the non-DeviceTree boot support,
so I'd like Michal's Acked-by before moving on.
Verified the device-tree and along with dm-spi on zynq.
Michal, Could you comment on this.
I don't have picozed board here to be able to test it. And doesn't matter because it it is applied to mainline already.

Quoted 6 lines

Quoted 1 line
I am just now sure why these big changes are coming after rc3.
The only reason I have applied these as DM and DM_SPI added in previous patches and picozed requires OF_CONTROL to built properly.
And we have verified this on microzed and xm010 as well.

No problem with this for now. We can fix it later if something is broken. We want to switch to DT anyway.

Thanks,
Michal