diff mbox

[U-Boot,2/2] armv8: ls1043a: load Fman ucode from SD/MMC under SD boot

Message ID 1459504373-4662-2-git-send-email-Qianyu.Gong@nxp.com
State Accepted
Commit 2a5558399828e24fce9e948288a88cd28887875e
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 | 10 +++++++++-
 1 file changed, 9 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 | 10 +++++++++-
>  1 file changed, 9 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 2432531..e900c50 100644
--- a/include/configs/ls1043a_common.h
+++ b/include/configs/ls1043a_common.h
@@ -216,7 +216,15 @@ 
 /* 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)
+#elif defined(CONFIG_SD_BOOT)
+/*
+ * PBL SD boot image should stored at 0x1000(8 blocks), the size of the image is
+ * about 1MB (2040 blocks), Env is stored after the image, and the env size is
+ * 0x2000 (16 blocks), 8 + 2040 + 16 = 2064, enlarge it to 2080(0x820).
+ */
+#define CONFIG_SYS_QE_FMAN_FW_IN_MMC
+#define CONFIG_SYS_FMAN_FW_ADDR		(512 * 0x820)
+#elif defined(CONFIG_QSPI_BOOT)
 #define CONFIG_SYS_QE_FW_IN_SPIFLASH
 #define CONFIG_SYS_FMAN_FW_ADDR		0x400d0000
 #define CONFIG_ENV_SPI_BUS		0