| Message ID | 20240814124108.2885-1-yasuharu.shibata@gmail.com |
|---|---|
| State | Accepted |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | [1/2] sandbox: Enable wget command | expand |
On Wed, 14 Aug 2024 at 06:47, Yasuharu Shibata <yasuharu.shibata@gmail.com> wrote: > > Enable this so that the tests run. > > Fix a few warnings in the code so that CI passes. > > Signed-off-by: Simon Glass <sjg@chromium.org> > Signed-off-by: Yasuharu Shibata <yasuharu.shibata@gmail.com> > --- > cmd/Kconfig | 1 + > net/wget.c | 7 +++---- > 2 files changed, 4 insertions(+), 4 deletions(-) > Reviewed-by: Simon Glass <sjg@chromium.org>
On Wed, 14 Aug 2024 21:41:06 +0900, Yasuharu Shibata wrote: > Enable this so that the tests run. > > Fix a few warnings in the code so that CI passes. > > Applied to u-boot/next, thanks!
diff --git a/cmd/Kconfig b/cmd/Kconfig index 978f44eda4..2562701d1e 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -2003,6 +2003,7 @@ config SYS_DISABLE_AUTOLOAD config CMD_WGET bool "wget" select PROT_TCP + default y if SANDBOX help wget is a simple command to download kernel, or other files, from a http server over TCP. diff --git a/net/wget.c b/net/wget.c index f1dd7abeff..945bfd2669 100644 --- a/net/wget.c +++ b/net/wget.c @@ -244,7 +244,7 @@ static void wget_connected(uchar *pkt, unsigned int tcp_seq_num, pkt_in_q = (void *)image_load_addr + PKT_QUEUE_OFFSET + (pkt_q_idx * PKT_QUEUE_PACKET_SIZE); - ptr1 = map_sysmem((phys_addr_t)pkt_in_q, len); + ptr1 = map_sysmem((ulong)pkt_in_q, len); memcpy(ptr1, pkt, len); unmap_sysmem(ptr1); @@ -314,9 +314,8 @@ static void wget_connected(uchar *pkt, unsigned int tcp_seq_num, for (i = 0; i < pkt_q_idx; i++) { int err; - ptr1 = map_sysmem( - (phys_addr_t)(pkt_q[i].pkt), - pkt_q[i].len); + ptr1 = map_sysmem((ulong)pkt_q[i].pkt, + pkt_q[i].len); err = store_block(ptr1, pkt_q[i].tcp_seq_num - initial_data_seq_num,