From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michal Simek Date: Mon, 31 Aug 2015 16:07:37 +0200 Subject: [U-Boot] [PATCH 07/13] arm: zynq: Use separate device tree instead of embedded In-Reply-To: References: <1440861022-22674-1-git-send-email-sjg@chromium.org> <1440861022-22674-8-git-send-email-sjg@chromium.org> <55E43959.6010300@monstr.eu> Message-ID: <55E45FA9.4010406@monstr.eu> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de On 08/31/2015 03:54 PM, Simon Glass wrote: > Hi Michal, > > On 31 August 2015 at 05:24, Michal Simek 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. ok then do we want to support this option? If this shouldn't be enabled in any config in the tree? (Note: someone has to enable that and keep building u-boot to ensure that this feature still work) The reason why I have enabled that was that using u-boot-dtb.img is breaking all users because they have to start to change a lot of things. That's why having OF_EMBED enabled was less painful. Users which use these boards just don't recognize any change when this feature is enabled. ... >>> 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? Using different names for u-boot image. 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: