Skip to contentSkip to conversation

armv8: ls1043a: load Fman ucode from NAND flash under NAND boot

PATCH New Gong Qianyu 2 participants 4 messages Apr 1, 2016 – Apr 6, 2016

lore
Share & tools
lore

Gong Qianyu

author
#0 lore raw

PATCH 1/2 armv8: ls1043a: load Fman ucode from NAND flash under NAND boot

Signed-off-by Gong Qianyu <[email protected]>
---
 include/configs/ls1043a_common.h | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
include/configs/ls1043a_common.h +5 -1
index fd243b1..2432531 100644
@@ -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
Signature · 1 line
2.1.0.27.g96db324
author
#1 lore raw

PATCH 2/2 armv8: ls1043a: load Fman ucode from SD/MMC under SD boot

Signed-off-by Gong Qianyu <[email protected]>
---
 include/configs/ls1043a_common.h | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)
include/configs/ls1043a_common.h +9 -1
index 2432531..e900c50 100644
@@ -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
Signature · 1 line
2.1.0.27.g96db324
#2 lore raw

PATCH 2/2 armv8: ls1043a: load Fman ucode from SD/MMC under SD boot

Quoted 5 lines · Gong Qianyu
Signed-off-by Gong Qianyu <[email protected]>
---
 include/configs/ls1043a_common.h | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

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

York

#3 lore raw

PATCH 1/2 armv8: ls1043a: load Fman ucode from NAND flash under NAND boot

In reply to Gong Qianyu
Quoted 5 lines · Gong Qianyu
Signed-off-by Gong Qianyu <[email protected]>
---
 include/configs/ls1043a_common.h | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

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

York