diff options
| author | Tom Rini <trini@konsulko.com> | 2019-11-04 12:57:41 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-11-04 12:57:41 -0500 |
| commit | 73b6e6ad254b36763419cdd3fdf406c0094517b7 (patch) | |
| tree | f432e1b568809834c52389b5075815700bc68026 /common | |
| parent | 3b02d614b429442333ec3d82eef0bba527be4f8c (diff) | |
| parent | ae8a53ece0ff3b1ed686c3e0af14e59973d25db8 (diff) | |
| download | u-boot-73b6e6ad254b36763419cdd3fdf406c0094517b7.zip u-boot-73b6e6ad254b36763419cdd3fdf406c0094517b7.tar.gz u-boot-73b6e6ad254b36763419cdd3fdf406c0094517b7.tar.bz2 | |
Merge tag 'u-boot-imx-20191104' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx
u-boot-imx-20191104
-------------------
- i.MX NAND: nandbcb support for MX6UL / i.MX7
- i.MX8: support for HAB
- Convert to DM (opos6ul, mccmon6)
- Toradex i.MX6ull colibri
- sync DTS with kernel
Travis : https://travis-ci.org/sbabic/u-boot-imx/builds/606853416
Diffstat (limited to 'common')
| -rw-r--r-- | common/spl/spl_nor.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/common/spl/spl_nor.c b/common/spl/spl_nor.c index 7df708d..b1e79b9 100644 --- a/common/spl/spl_nor.c +++ b/common/spl/spl_nor.c @@ -51,6 +51,11 @@ static int spl_nor_load_image(struct spl_image_info *spl_image, CONFIG_SYS_OS_BASE, (void *)header); +#if defined CONFIG_SYS_SPL_ARGS_ADDR && defined CONFIG_CMD_SPL_NOR_OFS + memcpy((void *)CONFIG_SYS_SPL_ARGS_ADDR, + (void *)CONFIG_CMD_SPL_NOR_OFS, + CONFIG_CMD_SPL_WRITE_SIZE); +#endif return ret; } #endif |