On 05/15/2017 06:43 PM, Zhao Qiang wrote:
modify u_qe_init to upload QE firmware from SD card when it is SD boot
Signed-off-by: Zhao Qiang qiang.zhao@nxp.com
Changes for v2:
- fix issue of memory leak
Changes for v3:
- add CONFIG_SYS_QE_FMAN_FW_IN_NOR to ls1021a
Changes for v4:
- rebase due to memory-mapping conflict
drivers/qe/qe.c | 37 ++++++++++++++++++++++++++++++++++++- include/configs/ls1021aqds.h | 1 + include/configs/ls1021atwr.h | 1 + include/configs/ls1043a_common.h | 2 ++ include/configs/ls1043ardb.h | 4 +--- 5 files changed, 41 insertions(+), 4 deletions(-)
diff --git a/drivers/qe/qe.c b/drivers/qe/qe.c index 4f0a278..52e4d7c 100644 --- a/drivers/qe/qe.c +++ b/drivers/qe/qe.c @@ -8,6 +8,7 @@ */
#include <common.h> +#include <malloc.h> #include <command.h> #include <linux/errno.h> #include <asm/io.h> @@ -17,6 +18,10 @@ #include <asm/arch/immap_ls102xa.h> #endif
+#ifdef CONFIG_SYS_QE_FMAN_FW_IN_MMC +#include <mmc.h> +#endif
#define MPC85xx_DEVDISR_QE_DISABLE 0x1
qe_map_t *qe_immr = NULL;
@@ -194,8 +199,38 @@ void u_qe_init(void) { qe_immr = (qe_map_t *)(CONFIG_SYS_IMMR + QE_IMMR_OFFSET);
- u_qe_upload_firmware((const void *)CONFIG_SYS_QE_FW_ADDR);
+#if defined(CONFIG_SYS_QE_FMAN_FW_IN_NOR)
- void *addr = (void *)CONFIG_SYS_QE_FW_ADDR;
+#elif defined(CONFIG_SYS_QE_FMAN_FW_IN_MMC)
- int dev = CONFIG_SYS_MMC_ENV_DEV;
- void *addr = malloc(CONFIG_SYS_QE_FMAN_FW_LENGTH);
- u32 cnt = CONFIG_SYS_QE_FMAN_FW_LENGTH / 512;
- u32 blk = CONFIG_SYS_QE_FW_ADDR / 512;
- if (mmc_initialize(gd->bd)) {
printf("%s: mmc_initialize() failed\n", __func__);return;- }
- struct mmc *mmc = find_mmc_device(CONFIG_SYS_MMC_ENV_DEV);
- if (!mmc) {
free(addr);printf("\nMMC cannot find device for ucode\n");- } else {
printf("\nMMC read: dev # %u, block # %u, count %u ...\n",dev, blk, cnt);mmc_init(mmc);(void)mmc->block_dev.block_read(&mmc->block_dev, blk, cnt,addr);/* flush cache after read */flush_cache((ulong)addr, cnt * 512);- }
+#endif
- u_qe_upload_firmware(addr); out_be32(&qe_immr->iram.iready, QE_IRAM_READY);
You are using addr outside of #if section. This causes compiling error for T1024, T1040, T1042, etc. Please test on both ARM and PowerPC platforms before sending a new version.
York