From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michal Simek Date: Thu, 2 Jul 2015 10:41:13 +0200 Subject: [U-Boot] [PATCH 2/2] zynq: defconfig: Move CONFIG_OF_* to Kconfig In-Reply-To: References: <1435568584-26470-1-git-send-email-jteki@openedev.com> <1435568584-26470-2-git-send-email-jteki@openedev.com> Message-ID: <5594F929.1020704@xilinx.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de On 07/02/2015 08:11 AM, Jagan Teki wrote: > On 2 July 2015 at 06:50, Masahiro Yamada wrote: >> 2015-07-02 2:08 GMT+09:00 Jagan Teki : >>> On 29 June 2015 at 14:33, Jagan Teki wrote: >>>> 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 >>>> Cc: Michal Simek >>>> Cc: Siva Durga Prasad Paladugu >>>> Cc: Masahiro Yamada >>>> --- >>>> 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(-) >>>> >>>> diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig >>>> index 5f026f0..192d9cf 100644 >>>> --- a/arch/arm/Kconfig >>>> +++ b/arch/arm/Kconfig >>>> @@ -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 >>>> diff --git a/configs/zynq_microzed_defconfig b/configs/zynq_microzed_defconfig >>>> index 533cdb5..c878924 100644 >>>> --- a/configs/zynq_microzed_defconfig >>>> +++ b/configs/zynq_microzed_defconfig >>>> @@ -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 >>>> diff --git a/configs/zynq_picozed_defconfig b/configs/zynq_picozed_defconfig >>>> index 76a76e0..af77a9d 100644 >>>> --- a/configs/zynq_picozed_defconfig >>>> +++ b/configs/zynq_picozed_defconfig >>>> @@ -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 >>>> diff --git a/configs/zynq_zc702_defconfig b/configs/zynq_zc702_defconfig >>>> index 2e40508..5dde452 100644 >>>> --- a/configs/zynq_zc702_defconfig >>>> +++ b/configs/zynq_zc702_defconfig >>>> @@ -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 >>>> diff --git a/configs/zynq_zc706_defconfig b/configs/zynq_zc706_defconfig >>>> index 7c3713e..0f96d16 100644 >>>> --- a/configs/zynq_zc706_defconfig >>>> +++ b/configs/zynq_zc706_defconfig >>>> @@ -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 >>>> diff --git a/configs/zynq_zc70x_defconfig b/configs/zynq_zc70x_defconfig >>>> index 41c04bb..525c538 100644 >>>> --- a/configs/zynq_zc70x_defconfig >>>> +++ b/configs/zynq_zc70x_defconfig >>>> @@ -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 >>>> diff --git a/configs/zynq_zc770_xm010_defconfig b/configs/zynq_zc770_xm010_defconfig >>>> index 73b5854..f1fc283 100644 >>>> --- a/configs/zynq_zc770_xm010_defconfig >>>> +++ b/configs/zynq_zc770_xm010_defconfig >>>> @@ -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 >>>> diff --git a/configs/zynq_zc770_xm012_defconfig b/configs/zynq_zc770_xm012_defconfig >>>> index 0d5c77e..73ed13d 100644 >>>> --- a/configs/zynq_zc770_xm012_defconfig >>>> +++ b/configs/zynq_zc770_xm012_defconfig >>>> @@ -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 >>>> diff --git a/configs/zynq_zc770_xm013_defconfig b/configs/zynq_zc770_xm013_defconfig >>>> index 8d320a1..211a41d 100644 >>>> --- a/configs/zynq_zc770_xm013_defconfig >>>> +++ b/configs/zynq_zc770_xm013_defconfig >>>> @@ -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 >>>> diff --git a/configs/zynq_zed_defconfig b/configs/zynq_zed_defconfig >>>> index 9f37849..f3c63f9 100644 >>>> --- a/configs/zynq_zed_defconfig >>>> +++ b/configs/zynq_zed_defconfig >>>> @@ -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 >>>> diff --git a/configs/zynq_zybo_defconfig b/configs/zynq_zybo_defconfig >>>> index e25573b..0c6117d 100644 >>>> --- a/configs/zynq_zybo_defconfig >>>> +++ b/configs/zynq_zybo_defconfig >>>> @@ -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 >>>> -- >>>> 1.9.1 >>>> >>> >>> Applied to u-boot-spi/master >>> >> >> >> Why u-boot-spi/master, not u-boot-microblaze/zynq ? > > As I sent these patches, as part of zynq dm support and dm-spi. > >> >> >> 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