From: Tom Rini Date: Wed, 11 Jul 2018 08:41:52 -0400 Subject: [U-Boot] [U-Boot, V2] spl: fit: Fix support for loading FPGA bitstream In-Reply-To: <20180601211929.30645-1-marex@denx.de> References: <20180601211929.30645-1-marex@denx.de> Message-ID: <20180711124152.GR27264@bill-the-cat> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de On Fri, Jun 01, 2018 at 11:19:29PM +0200, Marek Vasut wrote: > Move the FPGA loading from IS_ENABLED(CONFIG_SPL_OS_BOOT) && > IS_ENABLED(CONFIG_SPL_GZIP) conditional. The FPGA loading can > be used without OS loading and GZIP support in SPL. This issue > was most likely induced by some merge conflict, so fix it. > > Signed-off-by: Marek Vasut > Cc: Tom Rini Applied to u-boot/master, thanks! -- Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: not available URL: