From: Michal Simek <monstr@monstr.eu>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH 07/13] arm: zynq: Use separate device tree instead of embedded
Date: Mon, 31 Aug 2015 13:24:09 +0200 [thread overview]
Message-ID: <55E43959.6010300@monstr.eu> (raw)
In-Reply-To: <1440861022-22674-8-git-send-email-sjg@chromium.org>
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.
>
> 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
Thanks,
Michal
--
Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91
w: www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel - Microblaze cpu - http://www.monstr.eu/fdt/
Maintainer of Linux kernel - Xilinx Zynq ARM architecture
Microblaze U-BOOT custodian and responsible for u-boot arm zynq platform
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: OpenPGP digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20150831/cbb14eaf/attachment.sig>
next prev parent reply other threads:[~2015-08-31 11:24 UTC|newest]
Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-29 15:10 [U-Boot] [PATCH 00/13] dm: arm: zynq: Convert serial driver to driver model Simon Glass
2015-08-29 15:10 ` [U-Boot] [PATCH 01/13] fdt: Add a function to look up a /chosen property Simon Glass
2015-08-29 15:10 ` [U-Boot] [PATCH 02/13] fdt: Correct handling of alias regions Simon Glass
2015-08-29 15:10 ` [U-Boot] [PATCH 03/13] fdtgrep: Simplify the alias generation code Simon Glass
2015-08-29 15:10 ` [U-Boot] [PATCH 04/13] dm: serial: Deal with stdout-path with an alias Simon Glass
2015-08-31 11:13 ` Michal Simek
2015-08-31 13:54 ` Simon Glass
2015-08-31 14:08 ` Michal Simek
2015-08-31 23:12 ` Simon Glass
2015-08-29 15:10 ` [U-Boot] [PATCH 05/13] dm: spl: Generate u-boot-spl-dtb.bin only when enabled Simon Glass
2015-08-29 15:10 ` [U-Boot] [PATCH 06/13] dm: spl: Support device tree when BSS is in a different section Simon Glass
2015-08-29 15:10 ` [U-Boot] [PATCH 07/13] arm: zynq: Use separate device tree instead of embedded Simon Glass
2015-08-31 11:24 ` Michal Simek [this message]
2015-08-31 13:54 ` Simon Glass
2015-08-31 14:07 ` Michal Simek
2015-08-31 23:12 ` Simon Glass
2015-09-01 13:12 ` Michal Simek
2015-09-02 2:48 ` Simon Glass
2015-08-29 15:10 ` [U-Boot] [PATCH 08/13] arm: zynq: Drop unnecessary code in SPL board_init_f() Simon Glass
2015-08-29 15:10 ` [U-Boot] [PATCH 09/13] arm: zynq: Support the debug UART Simon Glass
2015-08-29 15:10 ` [U-Boot] [PATCH 10/13] dm: arm: zynq: Enable device tree control in SPL Simon Glass
2015-08-29 15:10 ` [U-Boot] [PATCH 11/13] arm: zynq: dts: Add U-Boot device tree additions Simon Glass
2015-08-31 10:01 ` Masahiro Yamada
2015-08-31 13:54 ` Simon Glass
2015-09-01 15:54 ` Masahiro Yamada
2015-08-31 11:30 ` Michal Simek
2015-08-31 13:54 ` Simon Glass
2015-08-31 14:16 ` Michal Simek
2015-08-31 23:13 ` Simon Glass
2015-09-01 15:41 ` Michal Simek
2015-09-01 16:19 ` Masahiro Yamada
2015-09-02 2:49 ` Simon Glass
2015-09-03 11:35 ` Michal Simek
2015-09-04 0:22 ` Simon Glass
2015-09-04 6:04 ` Michal Simek
2015-09-04 14:32 ` Simon Glass
2015-09-04 17:28 ` Michal Simek
2015-09-09 18:07 ` Simon Glass
2015-09-19 1:07 ` Michal Simek
2015-09-19 11:16 ` Tom Rini
2015-09-19 19:52 ` Simon Glass
2015-09-01 13:13 ` Michal Simek
2015-08-29 15:10 ` [U-Boot] [PATCH 12/13] arm: zynq: serial: Drop non-device-tree serial driver portions Simon Glass
2015-08-29 15:10 ` [U-Boot] [PATCH 13/13] arm: zynq: Move serial driver to driver model Simon Glass
2015-08-31 11:33 ` Michal Simek
2015-08-31 13:54 ` Simon Glass
2015-08-31 14:12 ` Michal Simek
2015-09-01 15:42 ` Michal Simek
2015-08-31 14:11 ` [U-Boot] [PATCH 00/13] dm: arm: zynq: Convert " Michal Simek
2015-08-31 23:12 ` Simon Glass
2015-09-01 15:45 ` Michal Simek
2015-09-01 17:41 ` Michal Simek
2015-09-01 17:50 ` Michal Simek
2015-09-02 14:05 ` Simon Glass
2015-09-04 5:53 ` Michal Simek
2015-09-04 23:40 ` Simon Glass
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=55E43959.6010300@monstr.eu \
--to=monstr@monstr.eu \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox