diff mbox

[U-Boot,1/2] armv8: ls1043a: load Fman ucode from NAND flash under NAND boot

Message ID 1459504373-4662-1-git-send-email-Qianyu.Gong@nxp.com
State Accepted
Commit fd1b147c2cd65be5a6a048e7c1b0c265bd575e6e
Delegated to: York Sun
Headers show

Commit Message

Gong Qianyu April 1, 2016, 9:52 a.m. UTC
Signed-off-by: Gong Qianyu <Qianyu.Gong@nxp.com>
---
 include/configs/ls1043a_common.h | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

Comments

York Sun April 6, 2016, 5:29 p.m. UTC | #1
On 04/01/2016 03:02 AM, Gong Qianyu wrote:
> Signed-off-by: Gong Qianyu <Qianyu.Gong@nxp.com>
> ---
>  include/configs/ls1043a_common.h | 6 +++++-
>  1 file changed, 5 insertions(+), 1 deletion(-)
> 

Applied to u-boot-fsl-qoriq master. Awaiting upstream.
Thanks.

York
diff mbox

Patch

diff --git a/include/configs/ls1043a_common.h b/include/configs/ls1043a_common.h
index fd243b1..2432531 100644
--- a/include/configs/ls1043a_common.h
+++ b/include/configs/ls1043a_common.h
@@ -212,7 +212,11 @@ 
 #ifdef CONFIG_SYS_DPAA_FMAN
 #define CONFIG_SYS_FM_MURAM_SIZE	0x60000
 
-#if defined(CONFIG_QSPI_BOOT) || defined(CONFIG_SD_BOOT_QSPI)
+#ifdef CONFIG_NAND_BOOT
+/* Store Fman ucode at offeset 0x160000(11 blocks). */
+#define CONFIG_SYS_QE_FMAN_FW_IN_NAND
+#define CONFIG_SYS_FMAN_FW_ADDR		(11 * CONFIG_SYS_NAND_BLOCK_SIZE)
+#elif defined(CONFIG_QSPI_BOOT) || defined(CONFIG_SD_BOOT_QSPI)
 #define CONFIG_SYS_QE_FW_IN_SPIFLASH
 #define CONFIG_SYS_FMAN_FW_ADDR		0x400d0000
 #define CONFIG_ENV_SPI_BUS		0