[U-Boot] [PATCH 07/13] arm: zynq: Use separate device tree instead of embedded

Simon Glass
2015-08-31T13:54:24Z

Hi Michal,

On 31 August 2015 at 05:24, Michal Simek <monstr@monstr.eu> wrote:
> On 08/29/2015 05:10 PM, Simon Glass wrote:
>> Production boards should not use CONFIG_OF_EMBED. Fix this for the Zybo
>> boards.
>
> Zynq boards?
>
> As you see I have enabled OF_EMBED some weeks ago.
> zynq: Make CONFIG_OF_EMBED default case
> 98b532b42079a7ffd617ce0330d6778288b7c535
>
> What's the reason not to use CONFIG_OF_EMBED for production boards?
> Strictly speaking none of these boards are production one.
> I would label them more as refence boards, development boards.

Well I mean that we should not have boards in the tree that use this
option, It has been a long-standing convention since device tree
support was added - see README.fdt-control. I'll send a patch to add
this note to Kconfig.

>
>>
>> The image to use now becomes u-boot-dtb.bin.
>>
>> For example, the .bif file should contain a line like:
>>
>> [load = 0x04000000,startup=0x04000000]/path/to/u-boot-dtb.bin
>>
>> instead of:
>>
>> [load = 0x04000000,startup=0x04000000]/path/to/u-boot.bin
>>
>> When device tree is enabled we need to load u-boot-dtb.img. Change the
>> settings so that SPL does the right thing.
>>
>> Signed-off-by: Simon Glass <sjg@chromium.org>
>> ---
>>
>> configs/zynq_microzed_defconfig | 2 +-
>> configs/zynq_picozed_defconfig | 2 +-
>> configs/zynq_zc702_defconfig | 2 +-
>> configs/zynq_zc706_defconfig | 2 +-
>> configs/zynq_zc70x_defconfig | 2 +-
>> configs/zynq_zc770_xm010_defconfig | 2 +-
>> configs/zynq_zc770_xm011_defconfig | 2 +-
>> configs/zynq_zc770_xm012_defconfig | 2 +-
>> configs/zynq_zc770_xm013_defconfig | 2 +-
>> configs/zynq_zed_defconfig | 2 +-
>> configs/zynq_zybo_defconfig | 2 +-
>> include/configs/zynq-common.h | 6 +++++-
>> 12 files changed, 16 insertions(+), 12 deletions(-)
>>
>> diff --git a/configs/zynq_microzed_defconfig b/configs/zynq_microzed_defconfig
>> index e9c3209..9d51540 100644
>> --- a/configs/zynq_microzed_defconfig
>> +++ b/configs/zynq_microzed_defconfig
>> @@ -9,5 +9,5 @@ CONFIG_FIT_SIGNATURE=y
>> # CONFIG_CMD_IMLS is not set
>> # CONFIG_CMD_FLASH is not set
>> # CONFIG_CMD_SETEXPR is not set
>> -CONFIG_OF_EMBED=y
>> +CONFIG_OF_SEPARATE=y
>> CONFIG_NET_RANDOM_ETHADDR=y
>> diff --git a/configs/zynq_picozed_defconfig b/configs/zynq_picozed_defconfig
>> index f2b71e9..3a42efb 100644
>> --- a/configs/zynq_picozed_defconfig
>> +++ b/configs/zynq_picozed_defconfig
>> @@ -6,5 +6,5 @@ CONFIG_SPL=y
>> # CONFIG_CMD_IMLS is not set
>> # CONFIG_CMD_FLASH is not set
>> # CONFIG_CMD_SETEXPR is not set
>> -CONFIG_OF_EMBED=y
>> +CONFIG_OF_SEPARATE=y
>> CONFIG_NET_RANDOM_ETHADDR=y
>> diff --git a/configs/zynq_zc702_defconfig b/configs/zynq_zc702_defconfig
>> index 0abb7a8..6faf928 100644
>> --- a/configs/zynq_zc702_defconfig
>> +++ b/configs/zynq_zc702_defconfig
>> @@ -8,5 +8,5 @@ CONFIG_FIT_SIGNATURE=y
>> # CONFIG_CMD_IMLS is not set
>> # CONFIG_CMD_FLASH is not set
>> # CONFIG_CMD_SETEXPR is not set
>> -CONFIG_OF_EMBED=y
>> +CONFIG_OF_SEPARATE=y
>> CONFIG_NET_RANDOM_ETHADDR=y
>> diff --git a/configs/zynq_zc706_defconfig b/configs/zynq_zc706_defconfig
>> index d67f507..d6559b5 100644
>> --- a/configs/zynq_zc706_defconfig
>> +++ b/configs/zynq_zc706_defconfig
>> @@ -9,5 +9,5 @@ CONFIG_FIT_SIGNATURE=y
>> # CONFIG_CMD_IMLS is not set
>> # CONFIG_CMD_FLASH is not set
>> # CONFIG_CMD_SETEXPR is not set
>> -CONFIG_OF_EMBED=y
>> +CONFIG_OF_SEPARATE=y
>> CONFIG_NET_RANDOM_ETHADDR=y
>> diff --git a/configs/zynq_zc70x_defconfig b/configs/zynq_zc70x_defconfig
>> index 37c249f..49c987a 100644
>> --- a/configs/zynq_zc70x_defconfig
>> +++ b/configs/zynq_zc70x_defconfig
>> @@ -9,5 +9,5 @@ CONFIG_FIT_SIGNATURE=y
>> # CONFIG_CMD_IMLS is not set
>> # CONFIG_CMD_FLASH is not set
>> # CONFIG_CMD_SETEXPR is not set
>> -CONFIG_OF_EMBED=y
>> +CONFIG_OF_SEPARATE=y
>> CONFIG_NET_RANDOM_ETHADDR=y
>> diff --git a/configs/zynq_zc770_xm010_defconfig b/configs/zynq_zc770_xm010_defconfig
>> index 0e826bb..4bfb9cc 100644
>> --- a/configs/zynq_zc770_xm010_defconfig
>> +++ b/configs/zynq_zc770_xm010_defconfig
>> @@ -10,6 +10,6 @@ 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_EMBED=y
>> +CONFIG_OF_SEPARATE=y
>> CONFIG_NET_RANDOM_ETHADDR=y
>> CONFIG_SPI_FLASH=y
>> diff --git a/configs/zynq_zc770_xm011_defconfig b/configs/zynq_zc770_xm011_defconfig
>> index 46d043b..2a61fe3 100644
>> --- a/configs/zynq_zc770_xm011_defconfig
>> +++ b/configs/zynq_zc770_xm011_defconfig
>> @@ -10,5 +10,5 @@ CONFIG_SYS_EXTRA_OPTIONS="ZC770_XM011"
>> # CONFIG_CMD_IMLS is not set
>> # CONFIG_CMD_FLASH is not set
>> # CONFIG_CMD_SETEXPR is not set
>> -CONFIG_OF_EMBED=y
>> +CONFIG_OF_SEPARATE=y
>> CONFIG_NET_RANDOM_ETHADDR=y
>> diff --git a/configs/zynq_zc770_xm012_defconfig b/configs/zynq_zc770_xm012_defconfig
>> index 34d479f..eb98a39 100644
>> --- a/configs/zynq_zc770_xm012_defconfig
>> +++ b/configs/zynq_zc770_xm012_defconfig
>> @@ -8,5 +8,5 @@ CONFIG_FIT_VERBOSE=y
>> CONFIG_FIT_SIGNATURE=y
>> CONFIG_SYS_EXTRA_OPTIONS="ZC770_XM012"
>> # CONFIG_CMD_SETEXPR is not set
>> -CONFIG_OF_EMBED=y
>> +CONFIG_OF_SEPARATE=y
>> CONFIG_NET_RANDOM_ETHADDR=y
>> diff --git a/configs/zynq_zc770_xm013_defconfig b/configs/zynq_zc770_xm013_defconfig
>> index c59599f..8d65c05 100644
>> --- a/configs/zynq_zc770_xm013_defconfig
>> +++ b/configs/zynq_zc770_xm013_defconfig
>> @@ -10,5 +10,5 @@ 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_EMBED=y
>> +CONFIG_OF_SEPARATE=y
>> CONFIG_NET_RANDOM_ETHADDR=y
>> diff --git a/configs/zynq_zed_defconfig b/configs/zynq_zed_defconfig
>> index 886b4a5..13bef36 100644
>> --- a/configs/zynq_zed_defconfig
>> +++ b/configs/zynq_zed_defconfig
>> @@ -9,5 +9,5 @@ CONFIG_FIT_SIGNATURE=y
>> # CONFIG_CMD_IMLS is not set
>> # CONFIG_CMD_FLASH is not set
>> # CONFIG_CMD_SETEXPR is not set
>> -CONFIG_OF_EMBED=y
>> +CONFIG_OF_SEPARATE=y
>> CONFIG_NET_RANDOM_ETHADDR=y
>> diff --git a/configs/zynq_zybo_defconfig b/configs/zynq_zybo_defconfig
>> index 77b9409..fc251dc 100644
>> --- a/configs/zynq_zybo_defconfig
>> +++ b/configs/zynq_zybo_defconfig
>> @@ -9,5 +9,5 @@ CONFIG_FIT_SIGNATURE=y
>> # CONFIG_CMD_IMLS is not set
>> # CONFIG_CMD_FLASH is not set
>> # CONFIG_CMD_SETEXPR is not set
>> -CONFIG_OF_EMBED=y
>> +CONFIG_OF_SEPARATE=y
>> CONFIG_NET_RANDOM_ETHADDR=y
>> diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h
>> index e7ab50a..aa4785f 100644
>> --- a/include/configs/zynq-common.h
>> +++ b/include/configs/zynq-common.h
>> @@ -319,7 +319,11 @@
>> #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1
>> #define CONFIG_SPL_LIBDISK_SUPPORT
>> #define CONFIG_SPL_FAT_SUPPORT
>> -#define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img"
>> +#ifdef CONFIG_OF_CONTROL
>> +# define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot-dtb.img"
>> +#else
>> +# define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img"
>> +#endif
>> #endif
>>
>> /* Disable dcache for SPL just for sure */
>>
>
> this was removed by Masahiro long time ago.
> kconfig: move CONFIG_OF_* to Kconfig
> sha1: 783e6a72b8278d59854ced41a4696c9a14abbb0b

What was moved?

Regards,
Simon