board: traverse: ten64: fix DPAA2 (network) DPL corruption issue

The DPAA2 DPL (data plane layout) file was previously
being loaded into 0x80300000, and set to be applied
just before hand off to the kernel.

When a FIT image with a load_address of 0x80000000 was
booted with bootm, the DPL in memory was overwritten.

Move the DPL load to 0x8E000000 (196MiB away from 0x80000000,
and below the other typical load addr of 0x90000000).

Ideally in the future, the DPL lazyapply command
("fsl_mc lazyapply DPL $dpl_addr") should be set to
load the DPL contents into a memory area owned by U-Boot.

Signed-off-by: Mathew McBride <matt@traverse.com.au>
Reviewed-by: Peng Fan <peng.fan@nxp.com>

diff --git a/include/configs/ten64.h b/include/configs/ten64.h
index e86c16313293736c099fc83d59f29820924c5e25..1601fb733e2973b93f6343d2dd536eab79b61df1 100644 (file)
--- a/include/configs/ten64.h
+++ b/include/configs/ten64.h
@@ -19,11 +19,14 @@
        "sf probe 0:0 && sf read 0x80000000 0x300000 0x200000 &&"       \
        "sf read 0x80200000 0x5C0000 0x40000 &&"                                \
        "fsl_mc start mc 0x80000000 0x80200000 && " \
-       "sf read 0x80300000 0x580000 0x40000 && fsl_mc lazyapply DPL 0x80300000\0"
+       "sf read 0x8E000000 0x580000 0x40000 && fsl_mc lazyapply DPL 0x8E000000 && "\
+       "echo 'default DPL loaded'\0"
 #define SD_MC_INIT_CMD                         \
        "mmcinfo; fatload mmc 0 0x80000000 mcfirmware/mc_ls1088a.itb; "\
        "fatload mmc 0 0x80200000 dpaa2config/dpc.0x1D-0x0D.dtb; "\
-       "fsl_mc start mc 0x80000000 0x80200000\0"
+       "fsl_mc start mc 0x80000000 0x80200000 && "     \
+       "fatload mmc 0 0x8E000000 dpaa2config/eth-dpl-all.dtb && " \
+       "fsl_mc lazyapply DPL 0x8E000000 && echo 'default DPL loaded'\0"
 
 #define BOOT_TARGET_DEVICES(func) \
        func(NVME, nvme, 0) \
@@ -45,7 +48,6 @@
        BOOTENV \
        "load_efi_dtb=mtd read devicetree $fdt_addr_r && fdt addr $fdt_addr_r && " \
        "fdt resize && fdt boardsetup\0" \
-       "bootcmd_recovery=mtd read recovery 0xa0000000; mtd read dpl 0x80100000 && " \
-       "fsl_mc apply DPL 0x80100000 && bootm 0xa0000000#ten64\0"
+       "bootcmd_recovery=mtd read recovery 0xa0000000; && bootm 0xa0000000#ten64\0"
 
 #endif /* __TEN64_H */