spl: ymodem: Add support for loading full fitImages
PATCH 1/1 spl: ymodem: Add support for loading full fitImages
Add support for loading fully featured fitImages over YModem in SPL. This is useful when various advanced features of full fitImages are needed in SPL.
--- common/spl/spl_ymodem.c | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-)
common/spl/spl_ymodem.c +19 -1
@@ -89,7 +89,25 @@ static int spl_ymodem_load_image(struct spl_image_info *spl_image,if (res <=0 ) goto end_stream; -if (IS_ENABLED (CONFIG_SPL_LOAD_FIT ) && +if (IS_ENABLED (CONFIG_SPL_LOAD_FIT_FULL ) && +image_get_magic ((struct image_header *)buf) ==FDT_MAGIC ) { + addr =CONFIG_SYS_LOAD_ADDR ; + ih = (struct image_header *)addr; + +memcpy ((void *)addr, buf, res); + size += res; + addr += res; + +while ((res =xyzModem_stream_read (buf,BUF_SIZE , &err)) >0 ) { +memcpy ((void *)addr, buf, res); + size += res; + addr += res; + } + + ret =spl_parse_image_header (spl_image, ih); +if (ret) +return ret; + }else if (IS_ENABLED (CONFIG_SPL_LOAD_FIT ) &&image_get_magic ((struct image_header *)buf) ==FDT_MAGIC ) {struct spl_load_info load;struct ymodem_fit_info info;
Signature · 1 line
2.20.1
PATCH 1/1 spl: ymodem: Add support for loading full fitImages
Quoted 23 lines · Marek Vasut
Add support for loading fully featured fitImages over YModem in SPL. This is useful when various advanced features of full fitImages are needed in SPL.
Signed-off-by Marek Vasut <[email protected]>Cc Tom Rini <[email protected]>--- common/spl/spl_ymodem.c | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-)common/spl/spl_ymodem.c +4
-1@@ -89,7 +89,25 @@ static int spl_ymodem_load_image(struct spl_image_info *spl_image,if (res <=0 ) goto end_stream; - if (IS_ENABLED(CONFIG_SPL_LOAD_FIT) && +if (IS_ENABLED (CONFIG_SPL_LOAD_FIT_FULL ) && +image_get_magic ((struct image_header *)buf) ==FDT_MAGIC ) { + addr =CONFIG_SYS_LOAD_ADDR ; + ih = (struct image_header *)addr;
common/spl/spl_ymodem.c static int spl_ymodem_load_image(struct spl_image_info *spl_image, · line 105
Quoted 10 lines
common/spl/spl_ymodem.c +10
-0+ +memcpy ((void *)addr, buf, res); + size += res; + addr += res; + +while ((res =xyzModem_stream_read (buf,BUF_SIZE , &err)) >0 ) { +memcpy ((void *)addr, buf, res); + size += res; + addr += res; + }
okay, but you are not parsing the FIT image here. Is this even booting? or you are doing some parsing after loading?
Also this code looks very much similar to the one available in the else part. Can we re use it?
Thanks and regards,
Lokesh
Quoted 9 lines
common/spl/spl_ymodem.c +5
-0+ + ret =spl_parse_image_header (spl_image, ih); +if (ret) +return ret; + }else if (IS_ENABLED (CONFIG_SPL_LOAD_FIT ) &&image_get_magic ((struct image_header *)buf) ==FDT_MAGIC ) {struct spl_load_info load;struct ymodem_fit_info info;
PATCH 1/1 spl: ymodem: Add support for loading full fitImages
Quoted 31 lines · Lokesh Vutla
Quoted 28 lines · Marek Vasut
Add support for loading fully featured fitImages over YModem in SPL. This is useful when various advanced features of full fitImages are needed in SPL.
Signed-off-by Marek Vasut <[email protected]>Cc Tom Rini <[email protected]>--- common/spl/spl_ymodem.c | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-)common/spl/spl_ymodem.c +9
-1@@ -89,7 +89,25 @@ static int spl_ymodem_load_image(struct spl_image_info *spl_image,if (res <=0 ) goto end_stream; - if (IS_ENABLED(CONFIG_SPL_LOAD_FIT) && +if (IS_ENABLED (CONFIG_SPL_LOAD_FIT_FULL ) && +image_get_magic ((struct image_header *)buf) ==FDT_MAGIC ) { + addr =CONFIG_SYS_LOAD_ADDR ; + ih = (struct image_header *)addr; + +memcpy ((void *)addr, buf, res); + size += res; + addr += res; +
Quoted 8 lines
common/spl/spl_ymodem.c static int spl_ymodem_load_image(struct spl_image_info *spl_image, · line 105
Quoted 5 lines
common/spl/spl_ymodem.c +5
-0+while ((res =xyzModem_stream_read (buf,BUF_SIZE , &err)) >0 ) { +memcpy ((void *)addr, buf, res); + size += res; + addr += res; + }okay, but you are not parsing the FIT image here. Is this even booting? or you are doing some parsing after loading?
Yes, it's booting since I'm using it for that purpose. I am doing some parsing after loading, see spl_parse_image_header(spl_image, ih); right below.
Quoted 2 lines
Also this code looks very much similar to the one available in the else part. Can we re use it?
No, that'd become a mess real quick, I don't want to mix those two use cases.
Quoted 12 lines
Thanks and regards,
LokeshQuoted 9 lines
common/spl/spl_ymodem.c +5
-0+ + ret =spl_parse_image_header (spl_image, ih); +if (ret) +return ret; + }else if (IS_ENABLED (CONFIG_SPL_LOAD_FIT ) &&image_get_magic ((struct image_header *)buf) ==FDT_MAGIC ) {struct spl_load_info load;struct ymodem_fit_info info;
Signature · 2 lines
Best regards, Marek Vasut
Quoted 6 lines · Marek Vasut
Add support for loading fully featured fitImages over YModem in SPL. This is useful when various advanced features of full fitImages are needed in SPL.
Signed-off-by Marek Vasut <[email protected]>Cc Tom Rini <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: not available URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190424/38281f56/attachment.sig>